Commit 0e19d3d0 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the trunk: 

cleanup changes and mod_http2 version number after backport.



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

CHANGES

+0 −3
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_http2: avoid unnecessary data retrieval for a trace log. Allow certain

     information retrievals on null bucket beams where it makes sense. [Stefan Eissing]



  *) mod_macro: fix usability of globally defined macros in .htaccess files.

     PR 57525.  [Jose Kahan <jose w3.org>, Yann Ylavic]

modules/http2/h2_version.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 * @macro

 * Version number of the http2 module as c string

 */

#define MOD_HTTP2_VERSION "1.10.13-DEV"

#define MOD_HTTP2_VERSION "1.10.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 0x010a0d

#define MOD_HTTP2_VERSION_NUM 0x010a0e





#endif /* mod_h2_h2_version_h */