On the trunk:

cleanup changes and mod_http2 version number after backport.

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

diff --git a/CHANGES b/CHANGES
index e63394533db9e5bff5edc8c5a90689f7735949b8..0598a2b2ddf51aa24e24aa1c51e957fdbbdc06b4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: avoid unnecessary data retrieval for a trace log. Allow certain
-     information retrievals on null bucket beams where it makes sense. [Stefan Eissing]
-
   *) mod_macro: fix usability of globally defined macros in .htaccess files.
      PR 57525.  [Jose Kahan <jose w3.org>, Yann Ylavic]
 

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index aa5ff3c58cef24e35886bfd62ac778280a148f07..505de7438f986f0956bcf69389a6549fbfb91f35 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.13-DEV"
+#define MOD_HTTP2_VERSION "1.10.14-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 0x010a0d
+#define MOD_HTTP2_VERSION_NUM 0x010a0e
 
 
 #endif /* mod_h2_h2_version_h */