From 4a248f320217df147ad2317ff36ceb1f3141b510 Mon Sep 17 00:00:00 2001
From: b1v1r <b1v1r@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Mon, 27 Jul 2009 21:56:33 +0000
Subject: [PATCH] Update regression tests.

---
 apache2/t/regression/action/10-logging.t      |  4 +-
 .../t/regression/misc/00-multipart-parser.t   | 40 +++++++++----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/apache2/t/regression/action/10-logging.t b/apache2/t/regression/action/10-logging.t
index 0c15bd42..0a199eab 100644
--- a/apache2/t/regression/action/10-logging.t
+++ b/apache2/t/regression/action/10-logging.t
@@ -134,9 +134,7 @@
 		SecAction "phase:1,pass,nolog,auditlog"
 	),
 	match_log => {
-		-error => [ qr/ModSecurity: /, 1 ],
-		# No message, but should have data.  This may need changed
-		audit => [ qr/-H--\s+Stopwatch: /s, 1 ],
+		audit => [ qr/-H--\s+Message: .*Stopwatch: /s, 1 ],
 	},
 	match_response => {
 		status => qr/^200$/,
diff --git a/apache2/t/regression/misc/00-multipart-parser.t b/apache2/t/regression/misc/00-multipart-parser.t
index d0732ab4..850faedf 100644
--- a/apache2/t/regression/misc/00-multipart-parser.t
+++ b/apache2/t/regression/misc/00-multipart-parser.t
@@ -30,11 +30,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 				-----------------------------69343412719991675451336310646--
 			),
@@ -70,11 +70,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 				-----------------------------69343412719991675451336310646--),
 		),
@@ -111,11 +111,11 @@
 			q(
 				--------------------------------------------------boundary
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				--------------------------------------------------boundary
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 				--------------------------------------------------boundary--
 			),
@@ -154,11 +154,11 @@
 			q(
 				----------0xKhTmLbOuNdArY
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				----------0xKhTmLbOuNdArY
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 				----------0xKhTmLbOuNdArY--
 			),
@@ -195,11 +195,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="a"
-
+				
 				--test
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="b"
-
+				
 				--
 				-----------------------------69343412719991675451336310646--),
 		),
@@ -235,11 +235,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 			),
 		),
@@ -273,10 +273,10 @@
 		normalize_raw_request_data(
 			q(
 				-----------------------------69343412719991675451336310646
-
+				
 				1
 				-----------------------------69343412719991675451336310646
-
+				
 				2
 				-----------------------------69343412719991675451336310646--
 			),
@@ -311,11 +311,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data name="a"
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data name="b"
-
+				
 				2
 				-----------------------------69343412719991675451336310646--
 			),
@@ -351,11 +351,11 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data;
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data;
-
+				
 				2
 				-----------------------------69343412719991675451336310646--
 			),
@@ -391,13 +391,13 @@
 			q(
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="a"
-
+				
 				1
 				-----------------------------69343412719991675451336310646
 				:
 				-----------------------------69343412719991675451336310646
 				Content-Disposition: form-data; name="b"
-
+				
 				2
 				-----------------------------69343412719991675451336310646--
 			),