On the trunk:

update after mod_http2 backport

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

diff --git a/CHANGES b/CHANGES
index e6b5dcace9f2fde2a6b9532d10c4772adbdf7de5..687cf65e6b6cc28487272a72f1348cf7111278f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: fail requests without ERROR log in case we need to read interim
-     responses and see only garbage. This can happen if proxied servers send
-     data where none should be, e.g. a body for a HEAD request. [Stefan Eissing]
-     
   *) Evaluate nested If/ElseIf/Else configuration blocks.
      [Luca Toscano, Jacob Champion]
 

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 4a109d63d9109ffb69bf7f53a69a500d374f8126..9c052e320096330024f5e2c8ca0dc91796f8237d 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.5-DEV"
+#define MOD_HTTP2_VERSION "1.10.6-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 0x010a05
+#define MOD_HTTP2_VERSION_NUM 0x010a06
 
 
 #endif /* mod_h2_h2_version_h */