On the trunk:

mod_http2: update after backport

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

diff --git a/CHANGES b/CHANGES
index 7aac43e0990148491a748f0e3d3829d0c729082a..f192b9cb28d7bc8358dffae34e90259f9ef8fb2f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: rework of stream resource cleanup to avoid a crash in a close
-     of a lingering connection. Prohibit special file bucket beaming for
-     shared buckets. Files sent in stream output now use the stream pool
-     as read buffer, reducing memory footprint of connections.
-     [Yann Ylavic, Stefan Eissing]
-     
   *) mod_proxy_hcheck: Don't validate timed out responses.  [Yann Ylavic]
 
   *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index a67b6504caa8fc4bb2bdebb9e00d5677bf40f3b8..07a4732de1194deb6488e194d2ccb4cb208ea931 100644 (file)
--- 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.9-DEV"
+#define MOD_HTTP2_VERSION "1.8.10-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 0x010809
+#define MOD_HTTP2_VERSION_NUM 0x01080a
 
 
 #endif /* mod_h2_h2_version_h */