From: Stefan Eissing <icing@apache.org>
Date: Fri, 23 Dec 2016 12:13:07 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7a49f46f666806e6c6b3f498ac2833f34e735b0;p=apache

On the trunk:

Updates after mod_http2 backport



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

diff --git a/CHANGES b/CHANGES
index 36fbe9c2a3..92e1c4bdf3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: fixes https://github.com/icing/mod_h2/issues/126 e.g. beam
-     bucket lifetime handling when data is sent over temporary pools.
-     [Stefan Eissing] 
-  
   *) mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
      backend connection, happening with LogLevel trace2 or higher configured,
      or at any log level with compilers not detected as C99 compliant (e.g.
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 1b5080b935..90e17dd124 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.8.4-DEV"
+#define MOD_HTTP2_VERSION "1.8.5-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 0x010804
+#define MOD_HTTP2_VERSION_NUM 0x010805
 
 
 #endif /* mod_h2_h2_version_h */