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

diff --git a/CHANGES b/CHANGES
index 508efcbc86b3c6c2c53acbb9c2c34291f282ccbe..a6e81d99172467db33e64fc09a30d459c581489b 100644 (file)
--- 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 430b43f98f43dd41f5bc41974de80622d57c978f..6e540a10fdabce17d029f9fee799b528247d7b0d 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.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 */