On the trunk:

update after mod_http2 backport.

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

diff --git a/CHANGES b/CHANGES
index 2f692cf0d92e36c785761463b795367985bba362..7df69b0934872919f0acc527e214a28558d3b9f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,22 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: MaxKeepAliveRequests now limits the number of times a 
-     slave connection gets reused. [Stefan Eissing]
-
   *) mod_substitute: Fix spurious AH01328 (Line too long) errors on EBCDIC
      systems.  [Eric Covener]
 
-  *) mod_http2: client streams that lack the EOF flag get now forcefully
-     closed with a RST_STREAM (NO_ERROR) when the request has been answered.
-     [Stefan Eissing]     
-
-  *) mod_http2: only when 'HttpProtocolOptions Unsafe' is configured, will
-     control characters in response headers or trailers be forwarded to the
-     client. Otherwise, in the default configuration, a request will eiher 
-     fail with status 500 or the stream will be reset by a RST_STREAM frame. 
-     [Stefan Eissing]
-     
   *) core: Disallow multiple Listen on the same IP:port when listener buckets
      are configured (ListenCoresBucketsRatio > 0), consistently with the single
      bucket case (default), thus avoiding the leak of the corresponding socket

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 6e540a10fdabce17d029f9fee799b528247d7b0d..788a638a491b3c4a8c402a3f239a959ca69a7b98 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.2-DEV"
+#define MOD_HTTP2_VERSION "1.10.3-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 0x010a02
+#define MOD_HTTP2_VERSION_NUM 0x010a03
 
 
 #endif /* mod_h2_h2_version_h */