From: Stefan Eissing <icing@apache.org>
Date: Mon, 14 Nov 2016 11:15:39 +0000 (+0000)
Subject: update after mod_http2 backport
X-Git-Tag: 2.5.0-alpha~1016
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe86ff30fcb1cba38dcaf4867b4c4e8de4195c34;p=thirdparty%2Fapache%2Fhttpd.git

update after mod_http2 backport

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

diff --git a/CHANGES b/CHANGES
index 32bc6584c57..530da199ded 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,27 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: new directive 'H2PushResource' to enable early pushes before 
-     processing of the main request starts. Resources are announced to the 
-     client in Link headers on a 103 early hint response. 
-     All responses with status code <400 are inspected for Link header and
-     trigger pushes accordingly. 304 still does prevent pushes.
-     'H2PushResource' can mark resources as 'critical' which gives them higher
-     priority than the main resource. This leads to preferred scheduling for
-     processing and, when content is available, will send it first. 'critical'
-     is also recognized on Link headers. [Stefan Eissing]
-     
-  *) mod_proxy_http2: uris in Link headers are now mapped back to a suitable
-     local url when available. Relative uris with an absolute path are mapped
-     as well. This makes reverse proxy mapping available for resources
-     announced in this header. 
-     With 103 interim responses being forwarded to the main client connection,
-     this effectively allows early pushing of resources by a reverse proxied
-     backend server. [Stefan Eissing]
-     
-  *) mod_proxy_http2: adding support for newly proposed 103 status code.
-     [Stefan Eissing]
-     
   *) mpm_unix: Apache fails to start if previously crashed then restarted with
      the same PID (e.g. in container).  PR 60261.
      [Val <valentin.bremond gmail.com>, Yann Ylavic]
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 6b3594c991a..0a1c9071d26 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.0-DEV"
+#define MOD_HTTP2_VERSION "1.8.1-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 0x010800
+#define MOD_HTTP2_VERSION_NUM 0x010801
 
 
 #endif /* mod_h2_h2_version_h */