diff --git a/simple-sendfile.cabal b/simple-sendfile.cabal --- a/simple-sendfile.cabal +++ b/simple-sendfile.cabal @@ -1,5 +1,5 @@ Name: simple-sendfile -Version: 0.2.25 +Version: 0.2.26 Author: Kazu Yamamoto Maintainer: Kazu Yamamoto License: BSD3 @@ -47,7 +47,7 @@ else Other-Modules: Network.Sendfile.Fallback Build-Depends: conduit >= 1.0 && < 1.3 - , conduit-extra >= 1.0 && < 1.2 + , conduit-extra >= 1.0 && < 1.3 , transformers >= 0.2.2 && < 0.6 , resourcet diff --git a/test/SendfileSpec.hs b/test/SendfileSpec.hs --- a/test/SendfileSpec.hs +++ b/test/SendfileSpec.hs @@ -110,9 +110,9 @@ sf s1 | headers == [] = sendfile s1 inputFile range (return ()) | otherwise = sendfileWithHeader s1 inputFile range (return ()) headers - sendEOF = sClose + sendEOF = close teardown (s2,tid) = do - sClose s2 + close s2 killThread tid removeFileIfExists outputFile removeFileIfExists expectedFile @@ -150,9 +150,9 @@ sf s1 | headers == [] = sendfile s1 inputFile range (return ()) | otherwise = sendfileWithHeader s1 inputFile range (return ()) headers - sendEOF = sClose + sendEOF = close teardown (s2,tid) = do - sClose s2 + close s2 killThread tid removeFileIfExists outputFile inputFile = "test/inputFile" @@ -190,13 +190,13 @@ sf s1 ref | headers == [] = sendfile s1 tempFile range (hook ref) | otherwise = sendfileWithHeader s1 tempFile range (hook ref) headers - sendEOF = sClose + sendEOF = close hook ref = do n <- readIORef ref when (n == 10) $ setFileSize tempFile 900000 writeIORef ref (n+1) teardown (s2,tid) = do - sClose s2 + close s2 killThread tid removeFileIfExists tempFile removeFileIfExists outputFile