Commit 2ea07f9e authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the trunk: 

mod_http2: update after backport to 2.4.x


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

CHANGES

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

Changes with Apache 2.5.0



  *) mod_http2: adding support for MergeTrailers directive. [Stefan Eissing]

  

  *) mod_http2: limiting DATA frame sizes by TLS record sizes in use on the 

     connection. Flushing outgoing frames earlier. [Stefan Eissing]



  *) mod_remoteip: Add support for PROXY protocol (code donated by Cloudzilla).

     Add ability for PROXY protocol processing to be optional to donated code.

     See also: http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt

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.8.6-DEV"

#define MOD_HTTP2_VERSION "1.8.7-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 0x010806

#define MOD_HTTP2_VERSION_NUM 0x010807





#endif /* mod_h2_h2_version_h */