From: Jim Jagielski Date: Mon, 20 Jun 2016 13:10:06 +0000 (+0000) Subject: Backport X-Git-Tag: 2.4.22~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc151d334f7e2434030a195dab4cdc458bfd6bac;p=apache Backport Merge r1749151 from trunk: mod_http2: fix for request abort when connections drops, introduced in 1.5.8 Submitted by: icing Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749331 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 17ee005c4a..f5a513ace1 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.22 + *) mod_http2: fix for request abort when connections drops, introduced in + 1.5.8 + Changes with Apache 2.4.21 *) mod_http2: more rigid error handling in DATA frame assembly, leading diff --git a/STATUS b/STATUS index 71ac71fb7e..1bad200a32 100644 --- a/STATUS +++ b/STATUS @@ -146,11 +146,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x: trunk patch works +1: elukey - *) mod_http2: fix for request abort when connections drops, introduced in 1.5.8 - trunk patch: http://svn.apache.org/r1749151 - 2.4.x: trunk patch works - +1: jim - PATCHES/ISSUES THAT ARE BEING WORKED *) http: Don't remove the Content-Length of zero from a HEAD response if diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index 9b2cb956a1..2b8ed6bb7a 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -436,6 +436,9 @@ static void stream_done(h2_mplx *m, h2_stream *stream, int rst_error) if (stream->input) { m->tx_handles_reserved += h2_beam_get_files_beamed(stream->input); h2_beam_on_consumed(stream->input, NULL, NULL); + /* Let anyone blocked reading know that there is no more to come */ + h2_beam_abort(stream->input); + /* Remove mutex after, so that abort still finds cond to signal */ h2_beam_mutex_set(stream->input, NULL, NULL, NULL); } h2_stream_cleanup(stream);