Skip to content

?closefn -> ~closefn #400

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
rgrinberg merged 1 commit into from
Jul 25, 2015
Merged

?closefn -> ~closefn #400

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
18 changes: 7 additions & 11 deletions lwt-core/cohttp_lwt.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module Make_client
type ctx = Net.ctx with sexp_of
let default_ctx = Net.default_ctx

let read_response ?closefn ic oc meth =
let read_response ~closefn ic oc meth =
Response.read ic >>= function
| `Invalid reason ->
Lwt.fail (Failure ("Failed to read response: " ^ reason))
Expand All @@ -61,19 +61,15 @@ module Make_client
match has_body with
| `Yes | `Unknown ->
let reader = Response.make_body_reader res ic in
let stream = Body.create_stream
Response.read_body_chunk reader in
(match closefn with
|Some fn ->
Lwt_stream.on_terminate stream fn;
let gcfn st = fn () in
Gc.finalise gcfn stream
|None -> ()
);
let stream = Body.create_stream Response.read_body_chunk reader in
let closefn = closefn in
Lwt_stream.on_terminate stream closefn;
let gcfn st = closefn () in
Gc.finalise gcfn stream;
let body = Body.of_stream stream in
return (res, body)
| `No ->
(match closefn with |Some fn -> fn () |None -> ());
closefn ();
return (res, `Empty)
end

Expand Down