git.iko.soy/typeable/wai
on master help sign in
Fix warp-tls for new sendfile; version bumps
commit2b243e4074c338a3f50cf29657f403037d0dc059 authorMichael Snoyman <michael@snoyman.com> dateMon 25 Jun 2012, 20:38 (14 years ago) parentbc5e13d
6 files changed+9−7
compare with master
unifiedsplit
wai-app-static/wai-app-static.cabal+1−1 wai-eventsource/wai-eventsource.cabal+1−1 wai/wai.cabal+1−1 warp-tls/Network/Wai/Handler/WarpTLS.hs+3−1 warp-tls/warp-tls.cabal+2−2 warp/warp.cabal+1−1
wai-app-static/wai-app-static.cabal+1−1
@@ -1,5 +1,5 @@
11name: wai-app-static
2−version: 1.2.0.3
2+version: 1.2.0.4
33license: MIT
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>
wai-eventsource/wai-eventsource.cabal+1−1
@@ -1,5 +1,5 @@
11Name: wai-eventsource
2−Version: 1.2.0.2
2+Version: 1.2.0.3
33Synopsis: WAI support for server-sent events
44Description: WAI support for server-sent events
55License: MIT
wai/wai.cabal+1−1
@@ -1,5 +1,5 @@
11Name: wai
2−Version: 1.2.0.2
2+Version: 1.2.0.3
33Synopsis: Web Application Interface.
44Description: Provides a common protocol for communication between web applications and web servers.
55License: MIT
warp-tls/Network/Wai/Handler/WarpTLS.hs+3−1
@@ -58,7 +58,9 @@ runTLS tset set app = do
5858 let conn = Connection
5959 { connSendMany = TLS.sendData ctx . L.fromChunks
6060 , connSendAll = TLS.sendData ctx . L.fromChunks . return
61− , connSendFile = \fp offset len _th -> C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
61+ , connSendFile = \fp offset len _th headers -> do
62+ TLS.sendData ctx $ L.fromChunks headers
63+ C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
6264 , connClose = do
6365 TLS.bye ctx
6466 hClose h
warp-tls/warp-tls.cabal+2−2
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 1.2.0.4
2+Version: 1.2.1
33Synopsis: SSL support for Warp via the TLS package
44License: MIT
55License-file: LICENSE
@@ -16,7 +16,7 @@ Library
1616 Build-Depends: base >= 4 && < 5
1717 , bytestring >= 0.9
1818 , wai >= 1.2 && < 1.3
19− , warp >= 1.2 && < 1.3
19+ , warp >= 1.2.2 && < 1.3
2020 , transformers >= 0.2 && < 0.4
2121 , conduit >= 0.4 && < 0.5
2222 , network-conduit >= 0.4 && < 0.5
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 1.2.1.1
2+Version: 1.2.2
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE