Skip to content

Fix descriptor leak on thread cancellation for the Lwt client #447

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
Dec 13, 2015
Merged

Fix descriptor leak on thread cancellation for the Lwt client #447

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
10 changes: 6 additions & 4 deletions lwt-core/cohttp_lwt.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module Make_client
let default_ctx = Net.default_ctx

let read_response ~closefn ic oc meth =
Response.read ic >>= function
Response.read ic >>= begin function
| `Invalid reason ->
Lwt.fail (Failure ("Failed to read response: " ^ reason))
| `Eof -> Lwt.fail (Failure "Client connection was closed")
Expand All @@ -71,10 +71,12 @@ module Make_client
Gc.finalise gcfn stream;
let body = Body.of_stream stream in
return (res, body)
| `No ->
closefn ();
return (res, `Empty)
| `No -> return (res, `Empty)
end
end
|> fun t ->
Lwt.on_termination t closefn;
t

let is_meth_chunked = function
| `HEAD -> false
Expand Down