From: Stefan Eissing <icing@apache.org>
Date: Thu, 31 Mar 2016 16:30:19 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha~1805
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=478077c99b083478973d3f34301c5191e4265595;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

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

diff --git a/CHANGES b/CHANGES
index 49538dc31f1..ac605640105 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: incrementing keepalives on each request started so that logging
-     %k gives increasing numbers per master http2 connection. 
-     New documented variables in env, usable in custom log formats: H2_PUSH,
-     H2_PUSHED, H2_PUSHED_ON, H2_STREAM_ID and H2_STREAM_TAG.
-     [Stefan Eissing]
-
   *) core: Do not read .htaccess if AllowOverride and AllowOverrideList 
      are "None". PR 58528.
      [Michael Schlenker <msc contact.de, Ruediger Pluem, Daniel Ruggeri]
@@ -14,9 +8,6 @@ Changes with Apache 2.5.0
   *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
      [Petr <pgajdos suse.cz>]
 
-  *) mod_http2: more efficient passing of response bodies with less contention
-     and file bucket forwarding. [Stefan Eissing]
-
   *) mod_proxy_http2: using HTTP/2 flow control for backend streams by 
      observing data actually send out on the frontend h2 connection. 
      [Stefan Eissing]
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index eb63a32d2ba..a9bd29e895a 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.4.6-DEV"
+#define MOD_HTTP2_VERSION "1.4.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 0x010406
+#define MOD_HTTP2_VERSION_NUM 0x010407
 
 
 #endif /* mod_h2_h2_version_h */