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

[ic...@apache.org]

Author: icing
Date: Sun Dec  4 22:30:16 2016
New Revision: 1772580

URL: http://svn.apache.org/viewvc?rev=1772580&view=rev
Log:
update after mod_http2 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=1772580&r1=1772579&r2=1772580&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Dec  4 22:30:16 2016
@@ -1,10 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: CVE-2016-8740: Mitigate DoS memory exhaustion via endless
-     CONTINUATION frames.
-     [Naveen Tiwari <na...@asu.edu> and CDF/SEFCOM at Arizona State University, Stefan Eissing]
-
   *) mod_lua: Fix default value of LuaInherit directive. It should be 
      'parent-first' instead of 'none', as per documentation.  PR 60419
      [Christophe Jaillet]

Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1772580&r1=1772579&r2=1772580&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Sun Dec  4 22:30:16 2016
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.8.3-DEV"
+#define MOD_HTTP2_VERSION "1.8.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 0x010803
+#define MOD_HTTP2_VERSION_NUM 0x010804
 
 
 #endif /* mod_h2_h2_version_h */