github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed SecDefineRemoteAddr and fixed Apache 2.4 mod_remoteip integration

Browse Source
This commit is contained in:
Breno Silva
2013-05-06 00:49:07 -04:00
parent 06fc5e56c0
commit cd31b39ce1
4 changed files with 9 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apache2/apache2_config.c
View File

@@ -159,9 +159,6 @@ void *create_directory_config(apr_pool_t *mp, char *path)
/* xml external entity */
dcfg->xml_external_entity = NOT_SET;
/* remote addr define */
dcfg->remote_define = NOT_SET_P;
return dcfg;
}
@@ -601,10 +598,6 @@ void *merge_directory_configs(apr_pool_t *mp, void *_parent, void *_child)
merged->xml_external_entity = (child->xml_external_entity == NOT_SET
? parent->xml_external_entity : child->xml_external_entity);
/* remote add define */
merged->remote_define = (child->remote_define == NOT_SET_P
? parent->remote_define : child->remote_define);
return merged;
}
@@ -728,9 +721,6 @@ void init_directory_config(directory_config *dcfg)
/* xml external entity */
if (dcfg->xml_external_entity == NOT_SET) dcfg->xml_external_entity = 0;
/* remote addr define */
if (dcfg->remote_define == NOT_SET_P) dcfg->remote_define = "default";
}
/**
@@ -2296,15 +2286,6 @@ static const char *cmd_web_app_id(cmd_parms *cmd, void *_dcfg, const char *p1)
return NULL;
}
static const char *cmd_remote_addr_define(cmd_parms *cmd, void *_dcfg, const char *p1)
{
directory_config *dcfg = (directory_config *)_dcfg;
dcfg->remote_define = p1;
return NULL;
}
static const char *cmd_sensor_id(cmd_parms *cmd, void *_dcfg, const char *p1)
{
directory_config *dcfg = (directory_config *)_dcfg;
@@ -3494,14 +3475,6 @@ const command_rec module_directives[] = {
"id"
),
AP_INIT_TAKE1 (
"SecRemoteAddrDefine",
cmd_remote_addr_define,
NULL,
CMD_SCOPE_MAIN,
"Define a request header field to define remote addr"
),
AP_INIT_TAKE1 (
"SecSensorId",
cmd_sensor_id,