From: Stefan Eissing <icing@apache.org>
Date: Tue, 2 May 2017 15:30:07 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df25d7d14fbbb4283623e2986dced57adac56c1;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_proxy_http2: update after backport



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

diff --git a/CHANGES b/CHANGES
index c23e529f8d1..687cf65e6b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_proxy_http2: adding support for Reverse Proxy Request headers.
-     [Stefan Eissing]
-     
   *) Evaluate nested If/ElseIf/Else configuration blocks.
      [Luca Toscano, Jacob Champion]
 
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index eacde359d8f..4a109d63d91 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.4-DEV"
+#define MOD_HTTP2_VERSION "1.10.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 0x010a04
+#define MOD_HTTP2_VERSION_NUM 0x010a05
 
 
 #endif /* mod_h2_h2_version_h */