From: Stefan Eissing <icing@apache.org>
Date: Tue, 8 Dec 2015 13:36:57 +0000 (+0000)
Subject: merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeo... 
X-Git-Tag: 2.4.18~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adee5536569c3064c18fda13cf9b076a47d0afeb;p=apache

merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeouts do not send http/1.1 responses any more

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718600 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_switch.c b/modules/http2/h2_switch.c
index 49e5440624..ab8b90f7cc 100644
--- a/modules/http2/h2_switch.c
+++ b/modules/http2/h2_switch.c
@@ -152,6 +152,7 @@ static int h2_protocol_switch(conn_rec *c, request_rec *r, server_rec *s,
              */
             ap_remove_input_filter_byhandle(r->input_filters, "http_in");
             ap_remove_input_filter_byhandle(r->input_filters, "reqtimeout");
+            ap_remove_output_filter_byhandle(r->output_filters, "HTTP_HEADER");
             
             /* Ok, start an h2_conn on this one. */
             status = h2_conn_process(r->connection, r, r->server);