From: Stefan Eissing <icing@apache.org>
Date: Wed, 22 Feb 2017 10:09:11 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~623
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71b3aeb31c7aa5c3ba61e37f9b1950a2fe2289e2;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

upate after mod_http2 backport



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

diff --git a/CHANGES b/CHANGES
index fe42e7f21b8..52ac3bc847e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,8 +10,6 @@ Changes with Apache 2.5.0
      checks, loads and saves the request.
      PR 60577.  [Yann Ylavic]
   
-  *) mod_proxy_http2: support for ProxyPreserverHost directive. [Stefan Eissing]
-  
   *) mod_proxy_fcgi: Add ProxyFCGISetEnvIf to fixup CGI environment
      variables just before invoking the FastCGI. [Eric Covener,
      Jacob Champion]
@@ -21,9 +19,6 @@ Changes with Apache 2.5.0
      to set exceptions for ProxyPass specified in <Location> context.
      Use SetEnvIf, not SetEnv. [Eric Covener]
 
-  *) mod_http2: fix for crash when running out of memory.
-     [Robert Swiecki <robert@swiecki.net>, Stefan Eissing]
-     
   *) mod_ssl: work around leaks on (graceful) restart. [Yann Ylavic]
 
   *) When using mod_status with the Event MPM, report the number of requests
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 244285d9776..a3f3f8528da 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.9.1-DEV"
+#define MOD_HTTP2_VERSION "1.9.2-DEV"
 
 /**
  * @macro