Skip to content

Async client: do not read body if there is none #671

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

Merged
avsm merged 2 commits into from
Aug 11, 2019
Merged

Async client: do not read body if there is none #671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ddd7f
Async client: do not read body if there is none
emillon Jul 24, 2019
816409a
Rename to read_response
emillon Jul 25, 2019
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
21 changes: 14 additions & 7 deletions cohttp-async/src/client.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,22 @@ module Net = struct
Conduit_async.V2.connect ?interrupt mode
end

let read_request ic =
let read_response ic =
Response.read ic >>| function
| `Eof -> failwith "Connection closed by remote host"
| `Invalid reason -> failwith reason
| `Ok res ->
(* Build a response pipe for the body *)
let reader = Response.make_body_reader res ic in
let pipe = Body_raw.pipe_of_body Response.read_body_chunk reader in
(res, pipe)
begin
match Response.has_body res with
| `Yes | `Unknown ->
(* Build a response pipe for the body *)
let reader = Response.make_body_reader res ic in
let pipe = Body_raw.pipe_of_body Response.read_body_chunk reader in
(res, pipe)
| `No ->
let pipe = Pipe.of_list [] in
(res, pipe)
end

let request ?interrupt ?ssl_config ?uri ?(body=`Empty) req =
(* Connect to the remote side *)
Expand All @@ -67,7 +74,7 @@ let request ?interrupt ?ssl_config ?uri ?(body=`Empty) req =
Request.write (fun writer ->
Body_raw.write_body Request.write_body body writer) req oc
>>= fun () ->
read_request ic >>| fun (resp, body) ->
read_response ic >>| fun (resp, body) ->
don't_wait_for (
Pipe.closed body >>= fun () ->
Deferred.all_unit [Reader.close ic; Writer.close oc]);
Expand Down Expand Up @@ -96,7 +103,7 @@ let callv ?interrupt ?ssl_config uri reqs =
if Pipe.is_closed reqs && (!resp_c >= !reqs_c) then
return `Eof
else
ic |> read_request >>| fun (resp, body) ->
ic |> read_response >>| fun (resp, body) ->
Int.incr resp_c;
last_body_drained := Pipe.closed body;
`Ok (resp, `Pipe body)
Expand Down