Skip to content

Commit 73a79af

Browse files
author
Marc Stern
committed
Fixed duplicate log entry
use ap_log_error() if msr is NULL Fixed indentation
1 parent b53c227 commit 73a79af

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

apache2/re.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,6 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
297297

298298
if (value != NULL) value_len = strlen(value);
299299

300-
if (msr) {
301-
msr_log(msr, 9, "Trying to replace by variable name [%s] value [%s]", name, value);
302-
}
303-
304300
targets = (msre_var **)rule->targets->elts;
305301
// TODO need a good way to remove the element from array, maybe change array by tables or rings
306302
for (i = 0; i < rule->targets->nelts; i++) {
@@ -372,10 +368,10 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
372368
else {
373369

374370
target = strdup(p);
375-
if (target == NULL) {
376-
my_error_msg = apr_psprintf(ruleset->mp, "Error to update target - memory allocation");
377-
goto end;
378-
}
371+
if (target == NULL) {
372+
my_error_msg = apr_psprintf(ruleset->mp, "Error to update target - memory allocation");
373+
goto end;
374+
}
379375

380376
is_negated = is_counting = 0;
381377
param = name = value = NULL;
@@ -491,7 +487,14 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
491487
}
492488

493489
end:
494-
if (msr && my_error_msg) msr_log(msr, 9, my_error_msg);
490+
if (my_error_msg) {
491+
if (msr) msr_log(msr, 9, my_error_msg);
492+
#if !defined(MSC_TEST)
493+
else {
494+
ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, " ModSecurity: Successfully appended variable");
495+
}
496+
#endif
497+
}
495498
if (target_list != NULL) free(target_list);
496499
if (replace != NULL) free(replace);
497500
if (target != NULL) free(target);

0 commit comments

Comments
 (0)