diff options
author | Stefan Eissing <icing@apache.org> | 2016-12-23 13:13:07 +0100 |
---|---|---|
committer | Stefan Eissing <icing@apache.org> | 2016-12-23 13:13:07 +0100 |
commit | b7a49f46f666806e6c6b3f498ac2833f34e735b0 (patch) | |
tree | aa5807b1cb07cf268096609e2c79b1b93dff06c7 | |
parent | On the trunk: (diff) | |
download | apache2-b7a49f46f666806e6c6b3f498ac2833f34e735b0.tar.xz apache2-b7a49f46f666806e6c6b3f498ac2833f34e735b0.zip |
On the trunk:
Updates after mod_http2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1775823 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | modules/http2/h2_version.h | 4 |
2 files changed, 2 insertions, 6 deletions
@@ -1,10 +1,6 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 - *) mod_http2: fixes https://github.com/icing/mod_h2/issues/126 e.g. beam - bucket lifetime handling when data is sent over temporary pools. - [Stefan Eissing] - *) mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established backend connection, happening with LogLevel trace2 or higher configured, or at any log level with compilers not detected as C99 compliant (e.g. diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h index 1b5080b935..90e17dd124 100644 --- a/modules/http2/h2_version.h +++ b/modules/http2/h2_version.h @@ -26,7 +26,7 @@ * @macro * Version number of the http2 module as c string */ -#define MOD_HTTP2_VERSION "1.8.4-DEV" +#define MOD_HTTP2_VERSION "1.8.5-DEV" /** * @macro @@ -34,7 +34,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 0x010804 +#define MOD_HTTP2_VERSION_NUM 0x010805 #endif /* mod_h2_h2_version_h */ |