Commit 47a9682f authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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.


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



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

     [Chritophe Jaillet, Yann Ylavic]



  *) mod_userdir: If several directories are given in a UserDir directive, only files

     in the first existing one are checked. If the file is not found there, the

     other possible directories are not checked. The doc clearly states that they

modules/metadata/mod_remoteip.c

+0 −12
Changes for modules/metadata/mod_remoteip.c: 0 added lines, 12 removed lines.
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);