Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensuring to receive 4 bytes. #991

Merged
merged 3 commits into from
May 23, 2024
Merged

ensuring to receive 4 bytes. #991

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e508a2
ensuring to receive 4 bytes.
kazu-yamamoto May 15, 2024
eb7b730
recv4 breaks if "" is received.
kazu-yamamoto May 22, 2024
4247e5e
using null
kazu-yamamoto May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions warp/Network/Wai/Handler/Warp/Run.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,27 @@ serveConnection conn ii th origAddr transport settings app = do
if isHTTP2 transport
then return (True, "")
else do
bs0 <- connRecv conn
if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0
bs0 <- recv4 ""
if "PRI " `S.isPrefixOf` bs0
then return (True, bs0)
else return (False, bs0)
if settingsHTTP2Enabled settings && h2
then do
http2 settings ii conn transport app origAddr th bs
else do
http1 settings ii conn transport app origAddr th bs
where
recv4 bs0 = do
bs1 <- connRecv conn
if S.null bs1 then
return bs0
else do
-- In the case where bs0 is "", (<>) is called unnecessarily.
-- But we adopt this logic for simplicity.
let bs2 = bs0 <> bs1
if S.length bs2 >= 4
then return bs2
else recv4 bs2

-- | Set flag FileCloseOnExec flag on a socket (on Unix)
--
Expand Down
Loading