typeable/wai
1
0
Fork 0
mirror of https://github.com/typeable/wai.git synced 2025-01-08 15:37:19 +03:00
Code Issues Projects Releases Wiki Activity

refactoring sendResponse.

Browse Source
This commit is contained in:
Kazu Yamamoto 2013-11-05 12:04:41 +09:00
parent a0da0cb110
commit 71e6bd27c7
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
warp/Network/Wai/Handler/Warp/Response.hs
View File

@ -138,29 +138,25 @@ sendResponse :: Connection
----------------------------------------------------------------
sendResponse conn ii restore req reqidxhdr (ResponseFile s0 hs0 path mPart) =
restore $ fileRange s0 hs path mPart mRange >>= sendResponseEither
sendResponse conn ii restore req reqidxhdr (ResponseFile s0 hs0 path mPart)
| hasBody s0 req = restore $ do
ex <- fileRange s0 hs path mPart mRange
case ex of
Left _ -> sendResponse conn ii restore req reqidxhdr notFound
Right (s, hs1, beg, len) -> do
lheader <- composeHeader version s hs1
connSendFile conn path beg len (T.tickle th) [lheader]
T.tickle th
return isPersist
| otherwise = restore $ sendResponseNoBody conn th version s0 hs isPersist
where
hs = addServer rspidxhdr $ addAcceptRanges hs0
rspidxhdr = indexResponseHeader hs0
th = threadHandle ii
version = httpVersion req
(isPersist,_) = infoFromRequest req reqidxhdr
mRange = reqidxhdr ! idxRange
sendResponseEither (Right (s, lengthyHeaders, beg, len))
| hasBody s req = do
lheader <- composeHeader version s lengthyHeaders
connSendFile conn path beg len (T.tickle th) [lheader]
T.tickle th
return isPersist
| otherwise = sendResponseNoBody conn th version s hs isPersist
where
version = httpVersion req
(isPersist,_) = infoFromRequest req reqidxhdr
sendResponseEither (Left (SomeException _)) =
sendResponse conn ii restore req reqidxhdr notFound
where
notFound = responseLBS H.status404 [(H.hContentType, "text/plain")] "File not found"
notFound = responseLBS H.status404 [(H.hContentType, "text/plain")] "File not found"
----------------------------------------------------------------