diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-05-31 07:24:24 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-05-31 07:24:24 +0000 |
| commit | 989ebe3eaaf42c7a7202c93067a41e4ff0a086a2 (patch) | |
| tree | 56a6ff628e2e59e4cbc401396b890f95d6f600ff /modules/metadata | |
| parent | 68d4e9ad1b9ba07f98f2b10916b70c027d4a758f (diff) | |
| download | httpd-989ebe3eaaf42c7a7202c93067a41e4ff0a086a2.tar.gz | |
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
Diffstat (limited to 'modules/metadata')
| -rw-r--r-- | modules/metadata/mod_remoteip.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index d4f710425e..4572ce12a9 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -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); |