on master help sign in
Using a proper name.
8414f60Kazu Yamamoto
warp/Network/Wai/Handler/Warp/Response.hs+5−5
@@ -60,7 +60,7 @@ sendResponse settings ii req conn restore reqidxhdr (ResponseFile s0 hs0 path mp
60 Just part -> return (False, fromIntegral $ filePartByteCount part)
60 Just part -> return (False, fromIntegral $ filePartByteCount part)
61 Nothing -> (False, ) . fromIntegral . P.fileSize
61 Nothing -> (False, ) . fromIntegral . P.fileSize
62 <$> P.getFileStatus path
62 <$> P.getFileStatus path
63− let (s, addRange, beg, end) =
63+ let (s, addRange, beg, len) =
64 case mpart0 of
64 case mpart0 of
65 Just part -> (s0, id, filePartOffset part, filePartByteCount part)
65 Just part -> (s0, id, filePartOffset part, filePartByteCount part)
66 Nothing -> case reqidxhdr ! idxRange >>= parseByteRanges >>= listToMaybe of
66 Nothing -> case reqidxhdr ! idxRange >>= parseByteRanges >>= listToMaybe of
@@ -72,8 +72,8 @@ sendResponse settings ii req conn restore reqidxhdr (ResponseFile s0 hs0 path mp
72 _ -> (s0, id, 0, cl)
72 _ -> (s0, id, 0, cl)
73 hs'
73 hs'
74 | hadLength = hs
74 | hadLength = hs
75− | otherwise = addLength end hs
75+ | otherwise = addLength len hs
76− return (s, addRange hs', beg, end)
76+ return (s, addRange hs', beg, len)
77
77
78 rangeRes cl from to = (H.status206, (("Content-Range", rangeHeader cl from to):), from, to - from + 1)
78 rangeRes cl from to = (H.status206, (("Content-Range", rangeHeader cl from to):), from, to - from + 1)
79
79
@@ -85,10 +85,10 @@ sendResponse settings ii req conn restore reqidxhdr (ResponseFile s0 hs0 path mp
85 ( '/'
85 ( '/'
86 : showInt total ""))
86 : showInt total ""))
87
87
88− sendResponse' (Right (s, lengthyHeaders, beg, end))
88+ sendResponse' (Right (s, lengthyHeaders, beg, len))
89 | hasBody s req = liftIO $ do
89 | hasBody s req = liftIO $ do
90 lheader <- composeHeader settings version s lengthyHeaders
90 lheader <- composeHeader settings version s lengthyHeaders
91− connSendFile conn path beg end (T.tickle th) [lheader]
91+ connSendFile conn path beg len (T.tickle th) [lheader]
92 T.tickle th
92 T.tickle th
93 return isPersist
93 return isPersist
94 | otherwise = liftIO $ do
94 | otherwise = liftIO $ do