diff --git a/CHANGES b/CHANGES index f4b620ce..58b2de35 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ ?? ??? 2007 - 2.2.0-trunk ------------------------- + * Only calculate debugging vars when we are debugging (more to come). + * Removed strnlen() calls for non-GNU platforms. 11 May 2007 - 2.2.0-dev1 diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 50ab6518..db0071f8 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -110,14 +110,17 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c capture = apr_table_get(rule->actionset->actions, "capture") ? 1 : 0; /* Warn when the regex captures but "capture" is not set */ - if (msr->txcfg->debuglog_level >= 3) { + if (msr->txcfg->debuglog_level >= 4) { int capcount = 0; rc = msc_fullinfo(regex, PCRE_INFO_CAPTURECOUNT, &capcount); if ((capture == 0) && (capcount > 0)) { msr_log(msr, 4, "Ignoring regex captures since \"capture\" action is not enabled."); } if ((capture == 1) && (capcount == 0)) { - msr_log(msr, 3, "Notice. The \"capture\" action is enabled, but the regex does not have explicit captures."); + msr_log(msr, 5, "The \"capture\" action is enabled, but the regex does not have explicit captures."); + } + if ((capture == 0) && (capcount > 0)) { + msr_log(msr, 6, "The \"capture\" action is not enabled, but the regex contains captures."); } }