Commit d26bb40f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1832580, r1832581 from trunk: 

mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

Overwriting server config in pre_config hook breaks EXEC_ON_READ directives,
it's automatically created on purpose anyway.

PR 62220.


Follow up to r1832580: correct CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, wrowe, jim


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

CHANGES

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

Changes with Apache 2.4.34



  *) mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

     PR 62220.  [Chritophe Jaillet, Yann Ylavic]



  *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,

     zero out what had been initialized as the connection-level port.  PR59931.

     [Hank Ibell <hwibell gmail.com>]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -137,13 +137,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

                   PR 62220.

     trunk patch: https://svn.apache.org/r1832580

                  https://svn.apache.org/r1832581

     2.4.x patch: trunk works (modulo CHANGES)

                  svn merge -c 1832580,1832581 ^/httpd/httpd/trunk .

     +1: ylavic, wrowe, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/metadata/mod_remoteip.c

+0 −12
Original line number Diff line number Diff line
@@ -492,17 +492,6 @@ static const char *remoteip_disable_networks(cmd_parms *cmd, void *d, 
    return NULL;

}



static int remoteip_hook_pre_config(apr_pool_t *pconf, apr_pool_t *plog,

                              apr_pool_t *ptemp)

{

    remoteip_config_t *config = (remoteip_config_t *)

                                create_remoteip_server_config(pconf, NULL);

    ap_set_module_config(ap_server_conf->module_config, &remoteip_module,

                         config);



    return OK;

}



static int remoteip_hook_post_config(apr_pool_t *pconf, apr_pool_t *plog,

                               apr_pool_t *ptemp, server_rec *s)

{
@@ -1244,7 +1233,6 @@ static void register_hooks(apr_pool_t *p) 
        ap_register_input_filter("REMOTEIP_INPUT", remoteip_input_filter, NULL,

                                 AP_FTYPE_CONNECTION + 7);



    ap_hook_pre_config(remoteip_hook_pre_config, NULL, NULL, APR_HOOK_MIDDLE);

    ap_hook_post_config(remoteip_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE);

    ap_hook_pre_connection(remoteip_hook_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);

    ap_hook_post_read_request(remoteip_modify_request, NULL, NULL, APR_HOOK_FIRST);