Fix warp-tls for new sendfile implementation

meteficha · Jun 22, 2012 · 2095f1c · 2095f1c
1 parent 2011bd0
commit 2095f1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/warp-tls/Network/Wai/Handler/WarpTLS.hs b/warp-tls/Network/Wai/Handler/WarpTLS.hs
@@ -58,7 +58,9 @@ runTLS tset set app = do
             let conn = Connection
                     { connSendMany = TLS.sendData ctx . L.fromChunks
                     , connSendAll = TLS.sendData ctx . L.fromChunks . return
-                    , connSendFile = \fp offset len _th -> C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
+                    , connSendFile = \fp offset len _th headers -> C.runResourceT $ do
+                        TLS.sendData ctx $ L.fromChunks headers
+                        sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
                     , connClose = do
                         TLS.bye ctx
                         hClose h

diff --git a/warp/test/main.hs b/warp/test/main.hs
@@ -116,7 +116,7 @@ singlePostHello :: ByteString
 singlePostHello = "POST /hello HTTP/1.1\r\nHost: localhost\r\nContent-length: 5\r\n\r\nHello"
 
 main :: IO ()
-main = hspecX $ do
+main = hspec $ do
     describe "non-pipelining" $ do
         it "no body, read" $ runTest 5 readBody $ replicate 5 singleGet
         it "no body, ignore" $ runTest 5 ignoreBody $ replicate 5 singleGet