On the trunk:

mod_http2: update after backport

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

diff --git a/CHANGES b/CHANGES
index 0314c2e6c5358ae71a0dd0b8a069793b56a8afdb..1a589ea629ce9283ae45c7e7cb03a997e744d295 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: fixed possible deadlock that could occur when connections were 
-     terminated early with ongoing streams. Fixed possible hanger with timeout
-     on race when connection considers itself idle. [Stefan Eissing]  
-
   *) Introduce request taint checking framework to prevent privilege
      hijacking through .htaccess. [Nick Kew]
 

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 788a638a491b3c4a8c402a3f239a959ca69a7b98..eacde359d8f62bc96635160e03d5f20be900cb43 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.10.3-DEV"
+#define MOD_HTTP2_VERSION "1.10.4-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 0x010a03
+#define MOD_HTTP2_VERSION_NUM 0x010a04
 
 
 #endif /* mod_h2_h2_version_h */