Commit 73144822 authored by Daniel Ruggeri's avatar Daniel Ruggeri
Browse files

*) mod_remoteip: make proxy-protocol work on HTTP/2 connections. 

     trunk patch: http://svn.apache.org/r1827196
     2.4.x patch: svn merge -c 1827196 ^/httpd/httpd/trunk .
     +1: icing, ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1829486 13f79535-47bb-0310-9956-ffa450edef68
parent e3eaf33f

CHANGES

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

Changes with Apache 2.4.34



  *) mod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2

     requests. See also https://github.com/roadrunner2/mod-proxy-protocol/issues/6

     [Stefan Eissing]



  *) mod_ssl: Fix merging of proxy SSL context outside <Proxy> sections,

     regression introduced in 2.4.30. PR 62232. [Rainer Jung, Yann Ylavic]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -138,11 +138,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
                 'no_ocsp_for_cert_ok', which is undocumented.

                 Adding some new paramters also deserves a CHANGES entry.



  *) mod_remoteip: make proxy-protocol work on HTTP/2 connections.

     trunk patch: http://svn.apache.org/r1827196

     2.4.x patch: svn merge -c 1827196 ^/httpd/httpd/trunk .

     +1: icing, ylavic, jim



  *) core: Add <IfFile>, <IfDirective>, <IfSection>

     trunk patch: http://svn.apache.org/r1769718

                  http://svn.apache.org/r1785943

modules/metadata/mod_remoteip.c

+6 −1
Original line number Diff line number Diff line
@@ -887,8 +887,13 @@ static int remoteip_hook_pre_connection(conn_rec *c, void *csd) 
    remoteip_conn_config_t *conn_conf;

    int i;



    /* Do not attempt to manipulate slave connections */

    /* Establish master config in slave connections, so that request processing

     * finds it. */

    if (c->master != NULL) {

        conn_conf = ap_get_module_config(c->master->conn_config, &remoteip_module);

        if (conn_conf) {

            ap_set_module_config(c->conn_config, &remoteip_module, conn_conf);

        }

        return DECLINED;

    }