From 88ca67956b0081148be5bf75a99fcc6bc57fd2fb Mon Sep 17 00:00:00 2001
From: ivanr <ivanr@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Fri, 7 Sep 2007 14:15:37 +0000
Subject: [PATCH] Tidy code. Update MULTIPART_STRICT_ERROR with multipart
 changes from the trunk.

---
 apache2/mod_security2.c | 7 ++++++-
 apache2/re_variables.c  | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index 795aad36..32c99777 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -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;
diff --git a/apache2/re_variables.c b/apache2/re_variables.c
index d99449d1..189497d1 100644
--- a/apache2/re_variables.c
+++ b/apache2/re_variables.c
@@ -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");
         }