Skip to content

reqd.response_state: set to Upgrade after flush #143

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

Open
anmonteiro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

reqd.response_state: set to Upgrade after flush #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5aae8a
reqd.response_state: set to Upgrade after flush
anmonteiro Nov 29, 2024
1f1572d
chore: add changelog entry
anmonteiro Nov 30, 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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Unreleased
([#140](https://github.com/anmonteiro/httpun/pull/140))
- types: add `Headers.singleton`
([#146](https://github.com/anmonteiro/httpun/pull/146))
- server: only set response to upgraded after flushing response bytes
([#143](https://github.com/anmonteiro/httpun/pull/143))

0.2.0 2024-09-04
--------------
Expand Down
6 changes: 3 additions & 3 deletions lib/reqd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,15 @@ let unsafe_respond_with_upgrade t headers upgrade_handler =
let response = Response.create ~headers `Switching_protocols in
Writer.write_response t.writer response;
if t.persistent then t.persistent <- Response.persistent_connection response;
t.response_state <- Upgrade response;
Writer.flush t.writer (fun _reason ->
t.response_state <- Upgrade response;
(* TODO(anmonteiro): probably need to check `Closed here? *)
upgrade_handler ());
Body.Reader.close t.request_body;
Writer.wakeup t.writer
| Streaming _ | Upgrade _ ->
| Streaming _ ->
failwith "httpun.Reqd.unsafe_respond_with_upgrade: response already started"
| Fixed _ ->
| Fixed _ | Upgrade _ ->
failwith
"httpun.Reqd.unsafe_respond_with_upgrade: response already complete"

Expand Down