On the trunk:

mod_http2: update after backport

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

diff --git a/CHANGES b/CHANGES
index e0838a58d1d8edbb2fc78a9211049a8126f2a7a6..6166fa19e7bc000818936402145bbfdbe18756d8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: regression fix on PR 59348, on graceful restart, ongoing 
-     streams are finished normally before the final GOAWAY is sent. 
-     [Stefan Eissing, <slavko gmail.com>]
-     
   *) When using mod_status with the Event MPM, report the number of requests
      associated with an active connection in the "ACC" field. Previously
      zero was always reported with this MPM.  PR60647. [Eric Covener]

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index ea5dd4d87a058931defb2ef31872532a73cacbe5..c983392a34984ae273e4e3d77fa0a8cdee147893 100644 (file)
--- 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.11-DEV"
+#define MOD_HTTP2_VERSION "1.8.12-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 0x01080b
+#define MOD_HTTP2_VERSION_NUM 0x01080c
 
 
 #endif /* mod_h2_h2_version_h */