merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeo...

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 49e5440624e51f08f376537943a906447b700478..ab8b90f7cc597b5d436cc6b59cd661368466f72a 100644 (file)
--- 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);