From 8d649262fd27cb3e38a29dfa76ee0425ca54d21a Mon Sep 17 00:00:00 2001 From: brenosilva Date: Thu, 2 Aug 2012 18:27:14 +0000 Subject: [PATCH 1/2] Init variables --- apache2/re.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache2/re.c b/apache2/re.c index 51659730..26258a1d 100644 --- a/apache2/re.c +++ b/apache2/re.c @@ -52,7 +52,7 @@ static int fetch_target_exception(msre_rule *rule, modsec_rec *msr, msre_var *va char *myvalue = NULL, *myname = NULL; const apr_array_header_t *tarr = NULL; const apr_table_entry_t *telts = NULL; - int i, match; + int i, match = 0; if(msr == NULL) return 0; @@ -148,7 +148,7 @@ static int fetch_target_exception(msre_rule *rule, modsec_rec *msr, msre_var *va } - if(match) + if(match == 1) return 1; return 0; From 1c468a4a635b87e36182eb2e89f9fdc4d88340bd Mon Sep 17 00:00:00 2001 From: brenosilva Date: Thu, 2 Aug 2012 22:58:48 +0000 Subject: [PATCH 2/2] Revert pcre message warning mismatch --- apache2/mod_security2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index 9648976c..d9de6f6e 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -84,7 +84,7 @@ static void version(apr_pool_t *mp) { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Loaded APR do not match with compiled!"); } - pcre_vrs = apr_psprintf(mp,"%d.%02d", PCRE_MAJOR, PCRE_MINOR); + pcre_vrs = apr_psprintf(mp,"%d.%d ", PCRE_MAJOR, PCRE_MINOR); ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, "ModSecurity: PCRE compiled version=\"%s\"; "