From: Stefan Eissing <icing@apache.org>
Date: Tue, 6 Jun 2017 09:10:01 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~382
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a36c0fbfa2cbc381f10a2c67e224935c27eb54c;p=apache

On the trunk:

update after backport of mod_http2 fix.



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

diff --git a/CHANGES b/CHANGES
index f902759f98..20fc656c5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
-     the session in continuous check for state changes that never happen. 
-     [Stefan Eissing]
-
   *) Introduce request taint checking framework to prevent privilege
      hijacking through .htaccess. [Nick Kew]
 
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 9c052e3200..7b447d3c19 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.10.6-DEV"
+#define MOD_HTTP2_VERSION "1.10.7-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 0x010a06
+#define MOD_HTTP2_VERSION_NUM 0x010a07
 
 
 #endif /* mod_h2_h2_version_h */