on master help sign in
Merge branch 'master' into beta

Conflicts: wai-app-static/wai-app-static.cabal wai-eventsource/wai-eventsource.cabal wai/wai.cabal warp-tls/Network/Wai/Handler/WarpTLS.hs warp-tls/warp-tls.cabal warp/warp.cabal

commit464db93ae5c154de4b6ca78f0df6761faa50cf63 authorMichael Snoyman <michael@snoyman.com> dateMon 25 Jun 2012, 20:47 (14 years ago) parent2095f1c2b243e4
1 file changed+2−2
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2
@@ -58,9 +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 headers -> C.runResourceT $ do
61+ , connSendFile = \fp offset len _th headers -> do
6262 TLS.sendData ctx $ L.fromChunks headers
63− sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
63+ C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
6464 , connClose = do
6565 TLS.bye ctx
6666 hClose h