From: Stefan Eissing <icing@apache.org>
Date: Mon, 29 Jan 2018 13:03:49 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2920
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41515d4f0958a23d4a925ac4bf0329454f9ede1f;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_http2: discourage gzip/brotli content encoding on http2-status responses as
     they are inserted into the reponse when filters are already done.



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

diff --git a/CHANGES b/CHANGES
index 0adbfd547be..158b614a94d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_http2: discourage gzip/brotli content encoding on http2-status responses as
+     they are inserted into the reponse when filters are already done. [Stefan Eissing]
+     
   *) core: adding defines to allow interworking with honggfuzz without
      further patches. [Stefan Eissing, Robert Swiecki]
 
diff --git a/modules/http2/h2_filter.c b/modules/http2/h2_filter.c
index 09db72740fe..893bf123143 100644
--- a/modules/http2/h2_filter.c
+++ b/modules/http2/h2_filter.c
@@ -519,6 +519,11 @@ int h2_filter_h2_status_handler(request_rec *r)
         r->clength = -1;
         r->chunked = 1;
         apr_table_unset(r->headers_out, "Content-Length");
+        /* Discourage content-encodings */
+        apr_table_unset(r->headers_out, "Content-Encoding");
+        apr_table_setn(r->subprocess_env, "no-brotli", "1");
+        apr_table_setn(r->subprocess_env, "no-gzip", "1");
+
         ap_set_content_type(r, "application/json");
         apr_table_setn(r->notes, H2_FILTER_DEBUG_NOTE, "on");
 
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index abb8c1bc8c1..7d93f37ec50 100644
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.10.14-DEV"
+#define MOD_HTTP2_VERSION "1.10.15-DEV"
 
 /**
  * @macro
@@ -35,7 +35,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x010a0e
+#define MOD_HTTP2_VERSION_NUM 0x010a0f
 
 
 #endif /* mod_h2_h2_version_h */