svn commit: r1754129 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_version.h

[ic...@apache.org]

Author: icing
Date: Tue Jul 26 13:51:15 2016
New Revision: 1754129

URL: http://svn.apache.org/viewvc?rev=1754129&view=rev
Log:
mod_http2: update after backport

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http2/h2_version.h

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1754129&r1=1754128&r2=1754129&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Jul 26 13:51:15 2016
@@ -8,10 +8,6 @@ Changes with Apache 2.5.0
   *) mod_proxy: Correctly consider error response codes by the backend when
      processing failonstatus. PR 59869 [Ruediger Pluem]
 
-  *) mod_http2: new H2CopyFiles directive that changes treatment of file
-     handles in responses. Necessary in order to fix broken lifetime handling
-     in modules such as mod_wsgi.
-
   *) mod_proxy_fcgi: avoid loops when ProxyErrorOverride is enabled
      and the error documents are proxied. PR 55415. [Luca Toscano]
 
@@ -19,10 +15,6 @@ Changes with Apache 2.5.0
      not been modified (HTTP 304) to avoid subsequent bogus reads and
      confusing error messages logged. [Luca Toscano]
 
-  *) mod_http2: removing timeouts on master connection while requests are
-     being processed. Requests may timeout, but the master only times out when
-     no more requests are active. [Stefan Eissing]
-
   *) mod_crypto: Add the all purpose crypto filters with support for HLS.
      [Graham Leggett]
 

Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1754129&r1=1754128&r2=1754129&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Tue Jul 26 13:51:15 2016
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.5.13-DEV"
+#define MOD_HTTP2_VERSION "1.5.14-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 0x01050d
+#define MOD_HTTP2_VERSION_NUM 0x01050e
 
 
 #endif /* mod_h2_h2_version_h */