469a28f · typeable/wai

git.iko.soy/typeable/wai

http-types 0.8

commit469a28fc0c6d0df4afbce0ad3adf9003218ff22d authorMichael Snoyman <michael@snoyman.com> dateMon 28 Jan 2013, 21:40 (14 years ago) parentbeccf36

7 files changed+23−16

compare with master

unifiedsplit

wai-eventsource/wai-eventsource.cabal+2−2 wai-extra/wai-extra.cabal+2−2 wai-handler-launch/wai-handler-launch.cabal+2−2 wai-test/wai-test.cabal+2−2 wai/wai.cabal+4−4 warp-tls/pong.hs+8−1 warp/warp.cabal+3−3

wai-eventsource/wai-eventsource.cabal+2−2

@@ -1,5 +1,5 @@

11Name: wai-eventsource

2−Version: 1.3.0.1

2+Version: 1.3.0.2

33Synopsis: WAI support for server-sent events

44Description: WAI support for server-sent events

55License: MIT

@@ -18,7 +18,7 @@ Library

1818 , bytestring >= 0.9.1.4

1919 , blaze-builder >= 0.3 && < 0.4

2020 , conduit >= 0.5 && < 0.6

21− , http-types >= 0.7 && < 0.8

21+ , http-types >= 0.7

2222 , wai >= 1.3 && < 1.4

2323 , warp >= 1.3 && < 1.4

2424 , transformers

wai-extra/wai-extra.cabal+2−2

@@ -1,5 +1,5 @@

11Name: wai-extra

2−Version: 1.3.2

2+Version: 1.3.2.1

33Synopsis: Provides some basic WAI handlers and middleware.

44Description: The goal here is to provide common features without many dependencies.

55License: MIT

@@ -29,7 +29,7 @@ Library

2929 , directory >= 1.0.1

3030 , transformers >= 0.2.2 && < 0.4

3131 , blaze-builder >= 0.2.1.4 && < 0.4

32− , http-types >= 0.7 && < 0.8

32+ , http-types >= 0.7

3333 , text >= 0.7 && < 0.12

3434 , case-insensitive >= 0.2

3535 , data-default

wai-handler-launch/wai-handler-launch.cabal+2−2

@@ -1,5 +1,5 @@

11Name: wai-handler-launch

2−Version: 1.3.1.1

2+Version: 1.3.1.2

33Synopsis: Launch a web app in the default browser.

44Description: This handles cross-platform launching and inserts Javascript code to ping the server. When the server no longer receives pings, it shuts down.

55License: MIT

@@ -15,7 +15,7 @@ Library

1515 build-depends: base >= 4 && < 5

1616 , wai >= 1.3 && < 1.4

1717 , warp >= 1.3 && < 1.4

18− , http-types >= 0.7 && < 0.8

18+ , http-types >= 0.7

1919 , transformers >= 0.2.2 && < 0.4

2020 , bytestring >= 0.9.1.4

2121 , blaze-builder >= 0.2.1.4 && < 0.4

wai-test/wai-test.cabal+2−2

@@ -1,5 +1,5 @@

11name: wai-test

2−version: 1.3.0

2+version: 1.3.0.1

33license: MIT

44license-file: LICENSE

55author: Michael Snoyman <michael@snoyman.com>

@@ -24,7 +24,7 @@ library

2424 , blaze-builder-conduit >= 0.5 && < 0.6

2525 , cookie >= 0.2 && < 0.5

2626 , HUnit >= 1.2 && < 1.3

27− , http-types >= 0.7 && < 0.8

27+ , http-types >= 0.7

2828 , case-insensitive >= 0.2

2929 exposed-modules: Network.Wai.Test

3030 ghc-options: -Wall

wai/wai.cabal+4−4

@@ -1,5 +1,5 @@

11Name: wai

2−Version: 1.3.0.1

2+Version: 1.3.0.2

33Synopsis: Web Application Interface.

44Description: Provides a common protocol for communication between web applications and web servers.

55License: MIT

@@ -22,9 +22,9 @@ Library

2222 , blaze-builder >= 0.2.1.4 && < 0.4

2323 , conduit >= 0.5 && < 0.6

2424 , network >= 2.2.1.5

25− , http-types >= 0.7 && < 0.8

26− , text >= 0.7 && < 0.12

27− , transformers >= 0.2.2 && < 0.4

25+ , http-types >= 0.7

26+ , text >= 0.7

27+ , transformers >= 0.2.2

2828 , vault >= 0.1 && < 0.3

2929 Exposed-modules: Network.Wai

3030 ghc-options: -Wall

warp-tls/pong.hs+8−1

@@ -7,10 +7,17 @@ import Blaze.ByteString.Builder (copyByteString)

77import Data.Monoid

88import qualified Data.Conduit as C

99import qualified Data.Conduit.List as CL

10+import Network.HTTP.ReverseProxy

11+import Network.HTTP.Conduit

1012

1113main = do

1214 putStrLn "https://localhost:3000/"

13− runTLS (TLSSettings "certificate.pem" "key.pem") defaultSettings app

15+ manager <- newManager def

16+ runTLS (TLSSettings "warp-tls/certificate.pem" "warp-tls/key.pem") defaultSettings $

17+ waiProxyTo

18+ (const $ return $ Right $ ProxyDest "localhost" 3001)

19+ defaultOnExc

20+ manager

1421

1522app req = return $

1623 case rawPathInfo req of

warp/warp.cabal+3−3

@@ -1,5 +1,5 @@

11Name: warp

2−Version: 1.3.7.1

2+Version: 1.3.7.2

33Synopsis: A fast, light-weight web server for WAI applications.

44License: MIT

55License-file: LICENSE

@@ -28,7 +28,7 @@ Library

2828 , case-insensitive >= 0.2

2929 , conduit >= 0.5 && < 0.6

3030 , ghc-prim

31− , http-types >= 0.7 && < 0.8

31+ , http-types >= 0.7

3232 , lifted-base >= 0.1

3333 , network-conduit >= 0.5 && < 0.7

3434 , simple-sendfile >= 0.2.7 && < 0.3

@@ -76,7 +76,7 @@ Test-Suite spec

7676 , case-insensitive >= 0.2

7777 , conduit >= 0.5 && < 0.6

7878 , ghc-prim

79− , http-types >= 0.7 && < 0.8

79+ , http-types >= 0.7

8080 , lifted-base >= 0.1

8181 , network-conduit

8282 , simple-sendfile >= 0.2.4 && < 0.3