http-types 0.8

yesodweb · Jan 28, 2013 · 469a28f · 469a28f
1 parent beccf36
commit 469a28f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/wai-eventsource/wai-eventsource.cabal b/wai-eventsource/wai-eventsource.cabal
@@ -1,5 +1,5 @@
 Name:                wai-eventsource
-Version:             1.3.0.1
+Version:             1.3.0.2
 Synopsis:            WAI support for server-sent events
 Description:         WAI support for server-sent events
 License:             MIT
@@ -18,7 +18,7 @@ Library
     , bytestring                >= 0.9.1.4
     , blaze-builder             >= 0.3 && < 0.4
     , conduit                   >= 0.5      && < 0.6
-    , http-types                >= 0.7      && < 0.8
+    , http-types                >= 0.7
     , wai                       >= 1.3      && < 1.4
     , warp                      >= 1.3      && < 1.4
     , transformers

diff --git a/wai-extra/wai-extra.cabal b/wai-extra/wai-extra.cabal
@@ -1,5 +1,5 @@
 Name:                wai-extra
-Version:             1.3.2
+Version:             1.3.2.1
 Synopsis:            Provides some basic WAI handlers and middleware.
 Description:         The goal here is to provide common features without many dependencies.
 License:             MIT
@@ -29,7 +29,7 @@ Library
                    , directory                 >= 1.0.1
                    , transformers              >= 0.2.2    && < 0.4
                    , blaze-builder             >= 0.2.1.4  && < 0.4
-                   , http-types                >= 0.7      && < 0.8
+                   , http-types                >= 0.7
                    , text                      >= 0.7      && < 0.12
                    , case-insensitive          >= 0.2
                    , data-default

diff --git a/wai-handler-launch/wai-handler-launch.cabal b/wai-handler-launch/wai-handler-launch.cabal
@@ -1,5 +1,5 @@
 Name:                wai-handler-launch
-Version:             1.3.1.1
+Version:             1.3.1.2
 Synopsis:            Launch a web app in the default browser.
 Description:         This handles cross-platform launching and inserts Javascript code to ping the server. When the server no longer receives pings, it shuts down.
 License:             MIT
@@ -15,7 +15,7 @@ Library
     build-depends:   base                    >= 4       && < 5
                    , wai                     >= 1.3     && < 1.4
                    , warp                    >= 1.3     && < 1.4
-                   , http-types              >= 0.7     && < 0.8
+                   , http-types              >= 0.7
                    , transformers            >= 0.2.2   && < 0.4
                    , bytestring              >= 0.9.1.4
                    , blaze-builder           >= 0.2.1.4 && < 0.4

diff --git a/wai-test/wai-test.cabal b/wai-test/wai-test.cabal
@@ -1,5 +1,5 @@
 name:            wai-test
-version:         1.3.0
+version:         1.3.0.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -24,7 +24,7 @@ library
                    , blaze-builder-conduit     >= 0.5      && < 0.6
                    , cookie                    >= 0.2      && < 0.5
                    , HUnit                     >= 1.2      && < 1.3
-                   , http-types                >= 0.7      && < 0.8
+                   , http-types                >= 0.7
                    , case-insensitive          >= 0.2
     exposed-modules: Network.Wai.Test
     ghc-options:     -Wall

diff --git a/wai/wai.cabal b/wai/wai.cabal
@@ -1,5 +1,5 @@
 Name:                wai
-Version:             1.3.0.1
+Version:             1.3.0.2
 Synopsis:            Web Application Interface.
 Description:         Provides a common protocol for communication between web applications and web servers.
 License:             MIT
@@ -22,9 +22,9 @@ Library
                    , blaze-builder             >= 0.2.1.4  && < 0.4
                    , conduit                   >= 0.5      && < 0.6
                    , network                   >= 2.2.1.5
-                   , http-types                >= 0.7      && < 0.8
-                   , text                      >= 0.7      && < 0.12
-                   , transformers              >= 0.2.2    && < 0.4
+                   , http-types                >= 0.7
+                   , text                      >= 0.7
+                   , transformers              >= 0.2.2
                    , vault                     >= 0.1      && < 0.3
   Exposed-modules:   Network.Wai
   ghc-options:       -Wall
diff --git a/warp-tls/pong.hs b/warp-tls/pong.hs
@@ -7,10 +7,17 @@ import Blaze.ByteString.Builder (copyByteString)
 import Data.Monoid
 import qualified Data.Conduit as C
 import qualified Data.Conduit.List as CL
+import Network.HTTP.ReverseProxy
+import Network.HTTP.Conduit
 
 main = do
     putStrLn "https://localhost:3000/"
-    runTLS (TLSSettings "certificate.pem" "key.pem") defaultSettings app
+    manager <- newManager def
+    runTLS (TLSSettings "warp-tls/certificate.pem" "warp-tls/key.pem") defaultSettings $
+        waiProxyTo
+            (const $ return $ Right $ ProxyDest "localhost" 3001)
+            defaultOnExc
+            manager
 
 app req = return $
     case rawPathInfo req of

diff --git a/warp/warp.cabal b/warp/warp.cabal
@@ -1,5 +1,5 @@
 Name:                warp
-Version:             1.3.7.1
+Version:             1.3.7.2
 Synopsis:            A fast, light-weight web server for WAI applications.
 License:             MIT
 License-file:        LICENSE
@@ -28,7 +28,7 @@ Library
                    , case-insensitive          >= 0.2
                    , conduit                   >= 0.5      && < 0.6
                    , ghc-prim
-                   , http-types                >= 0.7      && < 0.8
+                   , http-types                >= 0.7
                    , lifted-base               >= 0.1
                    , network-conduit           >= 0.5      && < 0.7
                    , simple-sendfile           >= 0.2.7    && < 0.3
@@ -76,7 +76,7 @@ Test-Suite spec
                    , case-insensitive          >= 0.2
                    , conduit                   >= 0.5      && < 0.6
                    , ghc-prim
-                   , http-types                >= 0.7      && < 0.8
+                   , http-types                >= 0.7
                    , lifted-base               >= 0.1
                    , network-conduit
                    , simple-sendfile           >= 0.2.4    && < 0.3