From: Stefan Eissing <icing@apache.org>
Date: Fri, 27 Jan 2017 17:21:55 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~739
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1f832a6a64474ffc2429403b087243dd9c8ac3;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_http2: do not attempt to send responses on aborted slave connections.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780596 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_from_h1.c b/modules/http2/h2_from_h1.c
index d3f07a1b00d..a8f50987f34 100644
--- a/modules/http2/h2_from_h1.c
+++ b/modules/http2/h2_from_h1.c
@@ -517,7 +517,7 @@ apr_status_t h2_filter_headers_out(ap_filter_t *f, apr_bucket_brigade *bb)
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, f->c,
                   "h2_task(%s): output_filter called", task->id);
     
-    if (!task->output.sent_response) {
+    if (!task->output.sent_response && !f->c->aborted) {
         /* check, if we need to send the response now. Until we actually
          * see a DATA bucket or some EOS/EOR, we do not do so. */
         for (b = APR_BRIGADE_FIRST(bb);