]> granicus.if.org Git - apache/commitdiff
mod_http2: fix for request abort when connections drops, introduced in 1.5.8
authorStefan Eissing <icing@apache.org>
Sun, 19 Jun 2016 11:15:58 +0000 (11:15 +0000)
committerStefan Eissing <icing@apache.org>
Sun, 19 Jun 2016 11:15:58 +0000 (11:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1749151 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_mplx.c

index 9b2cb956a16a072974738b4bb17dfd6d316d1824..2b8ed6bb7a7e7ab18a8dded6d53dd01bf50f888d 100644 (file)
@@ -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);