github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-10 02:04:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy code. Update MULTIPART_STRICT_ERROR with multipart changes from the trunk.

Browse Source
This commit is contained in:
ivanr
2007-09-07 14:15:37 +00:00
parent 2538f63aa8
commit 88ca67956b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apache2/mod_security2.c
View File

@@ -586,17 +586,22 @@ static int hook_request_late(request_rec *r) {
/* If we are redirecting and there was no previous response it is
* an error page request and we ignore it.
*/
if ((msr->r->prev != NULL) && (msr->r->prev->headers_out == NULL || apr_is_empty_table(msr->r->prev->headers_out))) {
if ( (msr->r->prev != NULL)
&& ((msr->r->prev->headers_out == NULL) || (apr_is_empty_table(msr->r->prev->headers_out))) )
{
msr_log(msr, 9, "Allowing internally redirected error document: %s", msr->r->uri);
return DECLINED;
}
if (msr->was_intercepted) {
msr_log(msr, 4, "Phase REQUEST_BODY request already intercepted. Intercepting additional request.");
return perform_interception(msr);
}
if (msr->txcfg->debuglog_level >= 4) {
msr_log(msr, 4, "Phase REQUEST_BODY already complete, skipping.");
}
return DECLINED;
}
msr->phase_request_body_complete = 1;

1
apache2/re_variables.c
View File

@@ -1773,6 +1773,7 @@ static int var_multipart_strict_error_generate(modsec_rec *msr, msre_var *var, m
||(msr->mpd->flag_data_after != 0)
||(msr->mpd->flag_header_folding != 0)
||(msr->mpd->flag_lf_line != 0)
||(msr->mpd->flag_missing_semicolon != 0)
) {
return var_simple_generate(var, vartab, mptmp, "1");
}