From 3ef77de11805586584e235589423350379c5eff0 Mon Sep 17 00:00:00 2001 From: Breno Silva Date: Tue, 23 Oct 2012 01:20:33 -0400 Subject: [PATCH] Merging to release 2.7.1 --- CHANGES | 2 ++ apache2/re_actions.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 28934eab..61ec970e 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,8 @@ * Fixed DROP action was disabled for Apache 2 module by mistake. + * Fixed bug when use ctl:ruleRemoveByTag. + * Updated Reference Manual. 15 Oct 2012 - 2.7.0 diff --git a/apache2/re_actions.c b/apache2/re_actions.c index eceb8226..32475d55 100644 --- a/apache2/re_actions.c +++ b/apache2/re_actions.c @@ -1016,7 +1016,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, return 1; } else if (strcasecmp(name, "ruleRemoveByTag") == 0) { - rule_exception *re = apr_pcalloc(mptmp, sizeof(rule_exception)); + rule_exception *re = apr_pcalloc(msr->mp, sizeof(rule_exception)); re->type = RULE_EXCEPTION_REMOVE_TAG; re->param = (const char *)apr_pstrdup(msr->mp, value); re->param_data = msc_pregcomp(msr->mp, re->param, 0, NULL, NULL); @@ -1034,7 +1034,7 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, return 1; } else if (strcasecmp(name, "ruleRemoveByMsg") == 0) { - rule_exception *re = apr_pcalloc(mptmp, sizeof(rule_exception)); + rule_exception *re = apr_pcalloc(msr->mp, sizeof(rule_exception)); re->type = RULE_EXCEPTION_REMOVE_MSG; re->param = (const char *)apr_pstrdup(msr->mp, value); re->param_data = msc_pregcomp(msr->mp, re->param, 0, NULL, NULL);