summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2017-04-10 15:14:22 +0000
committerStefan Eissing <icing@apache.org>2017-04-10 15:14:22 +0000
commit5bded4caae09509298c613ae9e4cad0a4558d039 (patch)
tree212353611acd6698b04ebb9e02a2204e9e3e60c4
parentbcae4f014abbf424bc00235101df508186634187 (diff)
downloadhttpd-5bded4caae09509298c613ae9e4cad0a4558d039.tar.gz
On the trunk:
update after mod_http2 backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790850 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES7
-rw-r--r--modules/http2/h2_version.h4
2 files changed, 2 insertions, 9 deletions
diff --git a/CHANGES b/CHANGES
index 508efcbc86..a6e81d9917 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,6 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
- *) mod_http2: less and more granular mutex use for improved performance.
- [Stefan Eissing]
-
- *) mod_proxy_http2: Fixed bug in re-attempting proxy requests after
- connection error. Reliability of reconnect handling improved.
- [Stefan Eissing]
-
*) core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus avoiding the leak of the corresponding socket
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 430b43f98f..6e540a10fd 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.10.1-DEV"
+#define MOD_HTTP2_VERSION "1.10.2-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 0x010a01
+#define MOD_HTTP2_VERSION_NUM 0x010a02
#endif /* mod_h2_h2_version_h */