You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2018/01/29 13:03:49 UTC
svn commit: r1822502 - in /httpd/httpd/trunk: CHANGES
modules/http2/h2_filter.c modules/http2/h2_version.h
Author: icing
Date: Mon Jan 29 13:03:49 2018
New Revision: 1822502
URL: http://svn.apache.org/viewvc?rev=1822502&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/http2/h2_filter.c
httpd/httpd/trunk/modules/http2/h2_version.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1822502&r1=1822501&r2=1822502&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jan 29 13:03:49 2018
@@ -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]
Modified: httpd/httpd/trunk/modules/http2/h2_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_filter.c?rev=1822502&r1=1822501&r2=1822502&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_filter.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_filter.c Mon Jan 29 13:03:49 2018
@@ -519,6 +519,11 @@ int h2_filter_h2_status_handler(request_
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");
Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1822502&r1=1822501&r2=1822502&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Mon Jan 29 13:03:49 2018
@@ -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 */