From: Stefan Eissing <icing@apache.org>
Date: Sat, 27 Aug 2016 12:43:33 +0000 (+0000)
Subject: update after http2 backport
X-Git-Tag: 2.5.0-alpha~1193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e50ff193906bba89439953611923fe55b118a6;p=thirdparty%2Fapache%2Fhttpd.git

update after http2 backport

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

diff --git a/CHANGES b/CHANGES
index 3b57f5f91eb..5285016ba68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: if configured with nghttp2 1.14.0 and onward, invalid request
-     headers will immediately reset the stream with a PROTOCOL error. Feature
-     logged by module on startup as 'INVHD' in info message.
-     [Stefan Eissing]
-     
-  *) mod_http2: fixed handling of stream buffers during shutdown.
-     [Stefan Eissing]
-     
   *) mod_proxy_hcheck: Set health check URI and expression correctly for health
      check worker. PR 60038 [zdeno <zdeno@scnet.sk>]
 
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index a495b8e2d68..273a2ec1050 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.6.1-DEV"
+#define MOD_HTTP2_VERSION "1.6.2-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 0x010601
+#define MOD_HTTP2_VERSION_NUM 0x010602
 
 
 #endif /* mod_h2_h2_version_h */