github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics: Fix 0x0bdda1 indentation issues

Browse Source
This commit is contained in:
Felipe Zimmerle
2017-05-03 09:33:35 -03:00
parent 51f312736a
commit caadf97524
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apache2/re.c
View File

@@ -1889,12 +1889,17 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re
} }
} }
else if (rc < 0) { else if (rc < 0) {
const char *id = "", *msg = ""; const char *id = "";
if (rule->actionset) { const char *msg = "";
if (rule->actionset->id) id = rule->actionset->id; if (rule->actionset) {
if (rule->actionset->msg) msg = rule->actionset->msg; if (rule->actionset->id) {
} id = rule->actionset->id;
msr_log(msr, 1, "Rule processing failed (id=%s, msg=%s).", id, msg); }
if (rule->actionset->msg) {
msg = rule->actionset->msg;
}
}
msr_log(msr, 1, "Rule processing failed (id=%s, msg=%s).", id, msg);
if (msr->txcfg->reqintercept_oe == 1) { if (msr->txcfg->reqintercept_oe == 1) {
apr_table_clear(msr->matched_vars); apr_table_clear(msr->matched_vars);
@@ -1924,12 +1929,17 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re
} }
} }
else { else {
const char *id = "", *msg = ""; const char *id = "";
if (rule->actionset) { const char *msg = "";
if (rule->actionset->id) id = rule->actionset->id; if (rule->actionset) {
if (rule->actionset->msg) msg = rule->actionset->msg; if (rule->actionset->id) {
} id = rule->actionset->id;
msr_log(msr, 1, "Rule processing failed with unknown return code: %d (id=%s, msg=%s).", rc, id, msg); }
if (rule->actionset->msg) {
msg = rule->actionset->msg;
}
}
msr_log(msr, 1, "Rule processing failed with unknown return code: %d (id=%s, msg=%s).", rc, id, msg);
apr_table_clear(msr->matched_vars); apr_table_clear(msr->matched_vars);
return -1; return -1;
} }