git.iko.soy/typeable/wai
on master help sign in
Fix warnings in Handle-based file streaming
ece61c8Andrew Pritchard
warp/Network/Wai/Handler/Warp/HTTP2/Sender.hs+2−2
compare with master
unifiedsplit
@@ -27,7 +27,6 @@ import Network.Wai.Handler.Warp.HTTP2.HPACK
27import Network.Wai.Handler.Warp.HTTP2.Types
27import Network.Wai.Handler.Warp.HTTP2.Types
28import Network.Wai.Handler.Warp.IORef
28import Network.Wai.Handler.Warp.IORef
29import qualified Network.Wai.Handler.Warp.Settings as S
29import qualified Network.Wai.Handler.Warp.Settings as S
30−import qualified Network.Wai.Handler.Warp.Timeout as T
31import Network.Wai.Handler.Warp.Types
30import Network.Wai.Handler.Warp.Types
32import qualified System.PosixCompat.Files as P
31import qualified System.PosixCompat.Files as P
33
32
@@ -36,6 +35,7 @@ import qualified System.IO as IO
36#else
35#else
37import Network.Wai.Handler.Warp.FdCache (getFd)
36import Network.Wai.Handler.Warp.FdCache (getFd)
38import Network.Wai.Handler.Warp.SendFile (positionRead)
37import Network.Wai.Handler.Warp.SendFile (positionRead)
38+import qualified Network.Wai.Handler.Warp.Timeout as T
39import System.Posix.IO (openFd, OpenFileFlags(..), defaultFileFlags, OpenMode(ReadOnly), closeFd)
39import System.Posix.IO (openFd, OpenFileFlags(..), defaultFileFlags, OpenMode(ReadOnly), closeFd)
40import System.Posix.Types (Fd)
40import System.Posix.Types (Fd)
41#endif
41#endif
@@ -316,7 +316,7 @@ runStreamFile :: InternalInfo -> Buffer -> BufSize -> FilePath -> Maybe FilePart
316readOpenFile :: OpenFile -> Buffer -> BufSize -> Integer -> IO Int
316readOpenFile :: OpenFile -> Buffer -> BufSize -> Integer -> IO Int
317
317
318#ifdef WINDOWS
318#ifdef WINDOWS
319−runStreamFile ii buf room path mpart = do
319+runStreamFile _ buf room path mpart = do
320 (start, bytes) <- fileStartEnd path mpart
320 (start, bytes) <- fileStartEnd path mpart
321 -- fixme: how to close Handle? GC does it at this moment.
321 -- fixme: how to close Handle? GC does it at this moment.
322 h <- IO.openBinaryFile path IO.ReadMode
322 h <- IO.openBinaryFile path IO.ReadMode