From 3e58e99be74e7c9ab22b7de298ccbbadf817e059 Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Wed, 28 May 2008 00:02:22 +0000
Subject: [PATCH] Another small update to the regression tests.

---
 .../regression/action/00-disruptive-actions.t | 48 +++++++++----------
 .../config/10-response-directives.t           | 26 +++++++++-
 apache2/t/run-regression-tests.pl.in          |  1 -
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/apache2/t/regression/action/00-disruptive-actions.t b/apache2/t/regression/action/00-disruptive-actions.t
index 0d13bd7a..5987b57a 100644
--- a/apache2/t/regression/action/00-disruptive-actions.t
+++ b/apache2/t/regression/action/00-disruptive-actions.t
@@ -3,7 +3,7 @@
 # Pass
 {
 	type => "action",
-	comment => "pass action in phase:1",
+	comment => "pass in phase:1",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:1,pass"
@@ -21,7 +21,7 @@
 },
 {
 	type => "action",
-	comment => "pass action in phase:2",
+	comment => "pass in phase:2",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:2,pass"
@@ -39,7 +39,7 @@
 },
 {
 	type => "action",
-	comment => "pass action in phase:3",
+	comment => "pass in phase:3",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:3,pass"
@@ -57,7 +57,7 @@
 },
 {
 	type => "action",
-	comment => "pass action in phase:4",
+	comment => "pass in phase:4",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:4,pass"
@@ -77,7 +77,7 @@
 # Allow
 {
 	type => "action",
-	comment => "allow action in phase:1",
+	comment => "allow in phase:1",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:1,allow"
@@ -95,7 +95,7 @@
 },
 {
 	type => "action",
-	comment => "allow action in phase:2",
+	comment => "allow in phase:2",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:2,allow"
@@ -113,7 +113,7 @@
 },
 {
 	type => "action",
-	comment => "allow action in phase:3",
+	comment => "allow in phase:3",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:3,allow"
@@ -131,7 +131,7 @@
 },
 {
 	type => "action",
-	comment => "allow action in phase:4",
+	comment => "allow in phase:4",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:4,allow"
@@ -151,7 +151,7 @@
 # Deny
 {
 	type => "action",
-	comment => "deny action in phase:1",
+	comment => "deny in phase:1",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:1,deny"
@@ -168,7 +168,7 @@
 },
 {
 	type => "action",
-	comment => "deny action in phase:2",
+	comment => "deny in phase:2",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:2,deny"
@@ -185,7 +185,7 @@
 },
 {
 	type => "action",
-	comment => "deny action in phase:3",
+	comment => "deny in phase:3",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:3,deny"
@@ -202,7 +202,7 @@
 },
 {
 	type => "action",
-	comment => "deny action in phase:4",
+	comment => "deny in phase:4",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:4,deny"
@@ -221,7 +221,7 @@
 # Drop
 {
 	type => "action",
-	comment => "drop action in phase:1",
+	comment => "drop in phase:1",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:1,drop"
@@ -238,7 +238,7 @@
 },
 {
 	type => "action",
-	comment => "drop action in phase:2",
+	comment => "drop in phase:2",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:2,drop"
@@ -255,7 +255,7 @@
 },
 {
 	type => "action",
-	comment => "drop action in phase:3",
+	comment => "drop in phase:3",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:3,drop"
@@ -272,7 +272,7 @@
 },
 {
 	type => "action",
-	comment => "drop action in phase:4",
+	comment => "drop in phase:4",
 	conf => qq(
 		SecRuleEngine On
 		SecAction "phase:4,drop"
@@ -291,7 +291,7 @@
 # Redirect
 {
 	type => "action",
-	comment => "redirect action in phase:1 (get)",
+	comment => "redirect in phase:1 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:1,redirect:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -309,7 +309,7 @@
 },
 {
 	type => "action",
-	comment => "redirect action in phase:2 (get)",
+	comment => "redirect in phase:2 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:2,redirect:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -327,7 +327,7 @@
 },
 {
 	type => "action",
-	comment => "redirect action in phase:3 (get)",
+	comment => "redirect in phase:3 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:3,redirect:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -345,7 +345,7 @@
 },
 {
 	type => "action",
-	comment => "redirect action in phase:4 (get)",
+	comment => "redirect in phase:4 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:4,redirect:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -365,7 +365,7 @@
 # Proxy
 {
 	type => "action",
-	comment => "proxy action in phase:1 (get)",
+	comment => "proxy in phase:1 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:1,proxy:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -383,7 +383,7 @@
 },
 {
 	type => "action",
-	comment => "proxy action in phase:2 (get)",
+	comment => "proxy in phase:2 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:2,proxy:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -401,7 +401,7 @@
 },
 {
 	type => "action",
-	comment => "proxy action in phase:3 (get)",
+	comment => "proxy in phase:3 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:3,proxy:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
@@ -418,7 +418,7 @@
 },
 {
 	type => "action",
-	comment => "proxy action in phase:4 (get)",
+	comment => "proxy in phase:4 (get)",
 	conf => qq(
 		SecRuleEngine On
 		SecRule REQUEST_URI "\@streq /test2.txt" "phase:4,proxy:'http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt'"
diff --git a/apache2/t/regression/config/10-response-directives.t b/apache2/t/regression/config/10-response-directives.t
index 894b06ec..b43e6395 100644
--- a/apache2/t/regression/config/10-response-directives.t
+++ b/apache2/t/regression/config/10-response-directives.t
@@ -1,6 +1,30 @@
 ### Tests for directives altering how a response is handled
 
-# SecResponseBodyAccess
+# SecResponseBodyMimeTypesClear
+{
+	type => "config",
+	comment => "SecResponseBodyMimeTypesClear",
+	conf => qq(
+		SecRuleEngine On
+		SecResponseBodyAccess On
+		SecResponseBodyMimeTypesClear
+		SecDebugLog $ENV{DEBUG_LOG}
+		SecDebugLogLevel 9
+		SecRule RESPONSE_BODY "TEST" "phase:4,deny"
+	),
+	match_log => {
+		-error => [ qr/Access denied/, 1 ],
+		debug => [ qr/Not buffering response body for unconfigured MIME type/, 1 ],
+	},
+	match_response => {
+		status => qr/^200$/,
+	},
+	request => new HTTP::Request(
+		GET => "http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt",
+	),
+},
+
+# SecResponseBodyAccess & SecResponseBodyMimeType
 {
 	type => "config",
 	comment => "SecResponseBodyAccess (pos)",
diff --git a/apache2/t/run-regression-tests.pl.in b/apache2/t/run-regression-tests.pl.in
index 8dc90db5..e3af3127 100755
--- a/apache2/t/run-regression-tests.pl.in
+++ b/apache2/t/run-regression-tests.pl.in
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #!@PERL@
 #
 # Run regression tests.