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

Jump to bottom

Cohttp-lwt: Send 100-continue on POST with Expect: 100-continue #979

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

Cohttp-lwt: Send 100-continue on POST with Expect: 100-continue #979

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 39 additions & 3 deletions cohttp-lwt/src/server.ml
View file
Open in desktop
Expand Up @@ -87,13 +87,30 @@ module Make (IO : S.IO) = struct
in
respond_string ~status:`Not_found ~body ()

let read_body ic req =
let read_body ?send_100_continue_if_needed ic req =
match Http.Request.has_body req with
| `Yes ->
let reader = Request.make_body_reader req ic in
let body_stream = Body.create_stream Request.read_body_chunk reader in
let body_stream = match send_100_continue_if_needed with
| None -> body_stream
| Some f ->
(* See RFC7231 5.1.1 Expect
We MUST send a 100-continue and we MUST NOT wait for the body
before doing that.
*)
let start = Lwt_stream.from @@ fun () ->
f () >>= fun () ->
Lwt.return_none
in
Lwt_stream.append start body_stream
in
Body.of_stream body_stream
| `No | `Unknown -> `Empty
| `No | `Unknown ->
(* See RFC7231 5.1.1 Expect
If we know there is no message body we MAY send a 100 Continue, but
don't have to *)
`Empty

let handle_request callback conn req body =
Log.debug (fun m -> m "Handle request: %a." Request.pp_hum req);
Expand All @@ -111,14 +128,33 @@ module Make (IO : S.IO) = struct
`Response rsp))
(fun () -> Body.drain_body body)

let res_100_continue = Response.make ~status:`Continue ~flush:true ()

let send_100_continue oc =
Some (fun () -> Response.write_header res_100_continue oc)

let rec handle_client ic oc conn callback =
Request.read ic >>= function
| `Eof -> Lwt.return_unit
| `Invalid data ->
Log.err (fun m -> m "invalid input %s while handling client" data);
Lwt.return_unit
| `Ok req -> (
let body = read_body ic req in
let send_100_continue_if_needed =
(* See RFC7231 5.1.1 Expect
We MAY respond with 417 on Expect values other than 100-continue,
but we don't have to, so we can leave that up to the application
and handle only 100-continue here.

We do need to check the HTTP version, because we can't respond
with 100-continue on HTTP/1.0 (and I assume not on 0.9 either?).
*)
if Request.version req = `HTTP_1_1
&& Header.get (Request.headers req) "Expect" = Some "100-continue"
then send_100_continue oc
else None
in
let body = read_body ?send_100_continue_if_needed ic req in
handle_request callback conn req body >>= function
| `Response (res, body) ->
let flush = Response.flush res in
Expand Down