diff --git a/CHANGES b/CHANGES index 6dec15aa..f562ac3c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -05 Mar 2008 - 2.5.1-breach1 ---------------------------- +07 Mar 2008 - 2.5.1-rc1 +----------------------- + + * Fixed an issue where a match would not occur if transformation caching + was enabled. * Using "severity" in a default action is now just a warning. diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h index 788621a7..64b96243 100644 --- a/apache2/modsecurity.h +++ b/apache2/modsecurity.h @@ -63,7 +63,7 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[]; #define MODSEC_VERSION_MAJOR "2" #define MODSEC_VERSION_MINOR "5" #define MODSEC_VERSION_MAINT "0" -#define MODSEC_VERSION_TYPE "-breach" +#define MODSEC_VERSION_TYPE "-rc" #define MODSEC_VERSION_RELEASE "1" #define MODULE_NAME "ModSecurity for Apache" diff --git a/apache2/re.c b/apache2/re.c index dac80614..0fd7ecf8 100644 --- a/apache2/re.c +++ b/apache2/re.c @@ -1988,6 +1988,8 @@ static apr_status_t msre_rule_process_normal(msre_rule *rule, modsec_rec *msr) { return -1; } if (rc == RULE_MATCH) { + match_count++; + /* Return straight away if the transaction * was intercepted - no need to process the remaining * targets. diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml index d9655187..50d97d80 100644 --- a/doc/modsecurity2-apache-reference.xml +++ b/doc/modsecurity2-apache-reference.xml @@ -4,7 +4,7 @@ Manual - Version 2.5.1-breach1 (March 05, 2008) + Version 2.5.1-rc1 (March 07, 2008) 2004-2008 @@ -4606,14 +4606,26 @@ SecRule ARGS "attack" multiMatch Action Group: Disruptive - Example: + Example1: SecRule REQUEST_HEADERS:User-Agent "Test" log,pass + When using pass with SecRule with multiple + targets, all targets will be processed and + all non-disruptive actions will trigger for + every match found. In the second example the + TX:test target would be incremented by 1 for each matching + argument. + + Example2: + + SecRule ARGS "test" log,pass,setvar:TX.test=+1 + Note - Transaction will not be interrupted but it will be logged (unless - logging has been suppressed). + The transaction will not be interrupted but a log will be + generated for each matching target (unless logging has been + suppressed).
@@ -6053,4 +6065,4 @@ Server: Apache/2.x.x
- + \ No newline at end of file