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

server: support expect: 100-continue and sending 100 Continue responses #150

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

server: support expect: 100-continue and sending 100 Continue responses #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion lib/reqd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ let respond_with_string t response str =
Writer.write_response t.writer response;
Writer.write_string t.writer str;
if t.persistent then t.persistent <- Response.persistent_connection response;
t.response_state <- Fixed response;
if response.status <> `Continue then t.response_state <- Fixed response;
Writer.wakeup t.writer
| Streaming _ | Upgrade _ ->
failwith "httpun.Reqd.respond_with_string: response already started"
Expand Down
37 changes: 37 additions & 0 deletions lib_test/test_server_connection.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2504,6 +2504,42 @@ let test_connect_method () =
Alcotest.(check bool) "Callback was called" true !upgraded;
reader_yielded t

let test_100_continue () =
let final_response =
Response.create ~headers:(Headers.singleton ("content-length", "0")) `OK
in
let t =
let request_handler reqd =
let { Request.headers; _ } = Reqd.request reqd in
Alcotest.(check string)
"expect: 100-continue"
(Headers.get_exn headers "expect")
"100-continue";
Reqd.respond_with_string reqd (Response.create `Continue) "";
let request_body = Reqd.request_body reqd in
let rec on_read _buffer ~off:_ ~len:_ =
Body.Reader.schedule_read request_body ~on_eof ~on_read
and on_eof () =
Stdlib.Format.eprintf "EOF@.";
Reqd.respond_with_string reqd final_response ""
in
Body.Reader.schedule_read (Reqd.request_body reqd) ~on_eof ~on_read
in
create ~error_handler request_handler
in
read_request
t
(Request.create
~headers:(Headers.of_list [ "expect", "100-continue" ])
`POST
"/");
write_response
~msg:"100 continue response written"
t
(Response.create `Continue);
write_response ~msg:"Final response written" t final_response;
reader_ready t

let tests =
[ "initial reader state", `Quick, test_initial_reader_state
; "shutdown reader closed", `Quick, test_reader_is_closed_after_eof
Expand Down Expand Up @@ -2691,6 +2727,7 @@ let tests =
, `Quick
, test_write_response_after_read_eof )
; "CONNECT method", `Quick, test_connect_method
; "100 Continue", `Quick, test_100_continue
]

(*
Expand Down