diff --git a/CHANGES b/CHANGES
index 9a6942d8..84e1483f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,17 @@
-24 Aug 2009 - trunk
+18 Sep 2009 - trunk
 -------------------
 
+18 Sep 2009 - 2.5.10
+--------------------
+
+ * Cleanup mlogc so that it builds on Windows.
+
+ * Added more detailed messages to replace "Unknown error" in filters.
+
  * Added SecAuditLogDirMode and SecAuditLogFileMode to allow fine tuning
    auditlog permissions (especially with mpm-itk).
 
- * Cleaned up SecUploadFileMode implementation.
+ * Cleanup SecUploadFileMode implementation.
 
  * Cleanup build scripts.
 
diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
index bbb51366..fb9c6c7d 100644
--- a/apache2/apache2_config.c
+++ b/apache2/apache2_config.c
@@ -1049,7 +1049,7 @@ static const char *cmd_audit_log_dirmode(cmd_parms *cmd, void *_dcfg, const char
             return apr_psprintf(cmd->pool, "ModSecurity: Invalid value for SecAuditLogDirMode: %s", p1);
         }
 
-        dcfg->auditlog_dirperms = mode2fileperms((mode_t)mode);
+        dcfg->auditlog_dirperms = mode2fileperms(mode);
     }
 
     return NULL;
@@ -1069,7 +1069,7 @@ static const char *cmd_audit_log_filemode(cmd_parms *cmd, void *_dcfg, const cha
             return apr_psprintf(cmd->pool, "ModSecurity: Invalid value for SecAuditLogFileMode: %s", p1);
         }
 
-        dcfg->auditlog_fileperms = mode2fileperms((mode_t)mode);
+        dcfg->auditlog_fileperms = mode2fileperms(mode);
     }
 
     return NULL;
diff --git a/apache2/apache2_io.c b/apache2/apache2_io.c
index 85964c49..ac072a89 100644
--- a/apache2/apache2_io.c
+++ b/apache2/apache2_io.c
@@ -16,6 +16,8 @@
  * directly using the email address support@breach.com.
  *
  */
+#include <util_filter.h>
+
 #include "modsecurity.h"
 #include "apache2.h"
 
@@ -182,14 +184,14 @@ apr_status_t read_request_body(modsec_rec *msr, char **error_msg) {
 
         rc = ap_get_brigade(r->input_filters, bb_in, AP_MODE_READBYTES, APR_BLOCK_READ, HUGE_STRING_LEN);
         if (rc != APR_SUCCESS) {
-            /* NOTE Apache returns -3 here when the request is too large
-             *      and APR_EGENERAL when the client disconnects.
+            /* NOTE Apache returns AP_FILTER_ERROR here when the request is
+             *      too large and APR_EGENERAL when the client disconnects.
              */
             switch(rc) {
                 case APR_TIMEUP :
                     *error_msg = apr_psprintf(msr->mp, "Error reading request body: %s", get_apr_error(msr->mp, rc));
                     return -4;
-                case -3 :
+                case AP_FILTER_ERROR :
                     *error_msg = apr_psprintf(msr->mp, "Error reading request body: HTTP Error 413 - Request entity too large. (Most likely.)");
                     return -3;
                 case APR_EGENERAL :
@@ -417,8 +419,22 @@ static apr_status_t send_of_brigade(modsec_rec *msr, ap_filter_t *f) {
         }
 
         if (msr->txcfg->debuglog_level >= log_level) {
-            msr_log(msr, log_level, "Output filter: Error while forwarding response data (%d): %s",
-                rc, get_apr_error(msr->mp, rc));
+            switch(rc) {
+                case AP_NOBODY_WROTE :
+                    msr_log(msr, log_level, "Output filter: Error while forwarding response data (%d): No data", rc);
+                    break;
+                case AP_FILTER_ERROR :
+                    /* Look like this is caused by the error
+                     * already being handled, so we should ignore it
+                     *
+                    msr_log(msr, log_level, "Output filter: Error while forwarding response data (%d): Filter error", rc);
+                     */
+                    break;
+                default :
+                    msr_log(msr, log_level, "Output filter: Error while forwarding response data (%d): %s",
+                        rc, get_apr_error(msr->mp, rc));
+                    break;
+            }
         }
 
         return rc;
diff --git a/apache2/build/find_apu.m4 b/apache2/build/find_apu.m4
index 281d5146..27a96a89 100644
--- a/apache2/build/find_apu.m4
+++ b/apache2/build/find_apu.m4
@@ -26,7 +26,7 @@ AC_MSG_CHECKING([for libapu config script])
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        APU_CONFIG="`basename $x`"
+        APU_CONFIG=$x
         apu_path="no"
         break
     fi
diff --git a/apache2/build/find_lua.m4 b/apache2/build/find_lua.m4
index 8e9443f3..5c995615 100644
--- a/apache2/build/find_lua.m4
+++ b/apache2/build/find_lua.m4
@@ -25,7 +25,7 @@ AC_MSG_CHECKING([for liblua config script])
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        LUA_CONFIG="$x"
+        LUA_CONFIG=$x
         break
     fi
 
diff --git a/apache2/configure b/apache2/configure
index b70d0a71..34e7b006 100755
--- a/apache2/configure
+++ b/apache2/configure
@@ -5571,7 +5571,7 @@ $as_echo_n "checking for libapu config script... " >&6; }
 
 for x in ${test_paths}; do
         if test ! -d "$x" -a -e "$x"; then
-        APU_CONFIG="`basename $x`"
+        APU_CONFIG=$x
         apu_path="no"
         break
     fi
@@ -5721,7 +5721,7 @@ $as_echo_n "checking for liblua config script... " >&6; }
 
 for x in ${test_paths}; do
         if test ! -d "$x" -a -e "$x"; then
-        LUA_CONFIG="$x"
+        LUA_CONFIG=$x
         break
     fi
 
diff --git a/apache2/mlogc-src/Makefile.win b/apache2/mlogc-src/Makefile.win
new file mode 100755
index 00000000..a720bcb3
--- /dev/null
+++ b/apache2/mlogc-src/Makefile.win
@@ -0,0 +1,57 @@
+###########################################################################
+### You Will need to modify the following variables for your system
+###########################################################################
+###########################################################################
+
+# Path to Apache httpd installation
+BASE = C:\Apache2
+
+# Paths to required libraries
+PCRE = C:\work\pcre-7.0-lib
+CURL = C:\work\libcurl-7.19.3-win32-ssl-msvc
+
+# Linking libraries
+LIBS = $(BASE)\lib\libapr-1.lib \
+       $(BASE)\lib\libaprutil-1.lib \
+       $(PCRE)\lib\pcre.lib \
+       $(CURL)\lib\Release\curllib.lib \
+       wsock32.lib
+
+###########################################################################
+###########################################################################
+
+CC = cL
+
+MT = mt
+
+DEFS = /nologo /O2 /W3 -DWIN32 -DWINNT -Dinline=APR_INLINE -D_CONSOLE
+
+EXE = mlogc.exe
+
+INCLUDES = -I. -I.. \
+           -I$(PCRE)\include -I$(PCRE) \
+           -I$(CURL)\include -I$(CURL) \
+           -I$(BASE)\include 
+
+CFLAGS= -MT $(INCLUDES) $(DEFS)
+
+LDFLAGS = 
+
+OBJS = mlogc.obj
+
+all: $(EXE)
+
+.c.obj:
+	$(CC) $(CFLAGS) -c $< -Fo$@
+
+.cpp.obj:
+	$(CC) $(CFLAGS) -c $< -Fo$@
+
+$(EXE): $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) /link /NODEFAULTLIB:MSVCRT.lib /subsystem:console
+
+install: $(EXE)
+	copy $(EXE) $(BASE)\bin
+
+clean:
+	del $(OBJS) $(EXE) *.dll *.lib *.pdb *.idb *.ilk *.exp *.res *.rc *.bin *.manifest
diff --git a/apache2/mlogc-src/mlogc.c b/apache2/mlogc-src/mlogc.c
index 8e5549fc..8eda1cc4 100644
--- a/apache2/mlogc-src/mlogc.c
+++ b/apache2/mlogc-src/mlogc.c
@@ -80,8 +80,8 @@ do { \
 
 #define CMDLINE_OPTS        "fvh"
 
-#define IN                  0
-#define OUT                 1
+#define TXIN            0
+#define TXOUT           1
 
 #define STATUSBUF_SIZE      256
 
@@ -549,7 +549,7 @@ static void transaction_log(int direction, const char *entry)
     char msg[8196] = "";
 
     apr_snprintf(msg, sizeof(msg), "%u %s: %s\n", (unsigned int)apr_time_sec(apr_time_now()),
-        (direction == IN ? "IN" : "OUT"), entry);
+        (direction == TXIN ? "IN" : "OUT"), entry);
     nbytes = strlen(msg);
     apr_file_write_full(transaction_log_fd, msg, nbytes, &nbytes_written);
 }
@@ -954,25 +954,30 @@ static void logc_shutdown(int rc)
 static int handle_signals(int signum)
 {
     switch (signum) {
-    case SIGHUP:
-        error_log(LOG_NOTICE, NULL, "Caught SIGHUP, ignored.");
-        /* ENH: reload config? */
-        return 0;
     case SIGINT:
         error_log(LOG_NOTICE, NULL, "Caught SIGINT, shutting down.");
         logc_shutdown(0);
     case SIGTERM:
         error_log(LOG_NOTICE, NULL, "Caught SIGTERM, shutting down.");
         logc_shutdown(0);
+#ifndef WIN32
+    case SIGHUP:
+        error_log(LOG_NOTICE, NULL, "Caught SIGHUP, ignored.");
+        /* ENH: reload config? */
+        return 0;
     case SIGALRM:
         error_log(LOG_DEBUG, NULL, "Caught SIGALRM, ignored.");
         return 0;
     case SIGTSTP:
         error_log(LOG_DEBUG, NULL, "Caught SIGTSTP, ignored.");
         return 0;
+#endif /* WIN32 */
     }
-
+#ifndef WIN32
     error_log(LOG_NOTICE, NULL, "Caught unexpected signal %d: %s", signum, apr_signal_description_get(signum));
+#else
+    error_log(LOG_NOTICE, NULL, "Caught unexpected signal %d", signum);
+#endif /* WIN32 */
     logc_shutdown(1);
 
     return 0; /* should never reach */
@@ -1283,7 +1288,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
             /* Deal with the previous entry. */
             if (entry != NULL) {
                 error_log(LOG_DEBUG, thread, "Removing previous entry from storage.");
-                transaction_log(OUT, entry->line);
+                transaction_log(TXOUT, entry->line);
 
                 /* Remove previous entry from storage. */
                 apr_hash_set(in_progress, &entry->id, sizeof(entry->id), NULL);
@@ -1539,7 +1544,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
             *(entry_t **)apr_array_push(queue) = entry;
         }
         else {
-            transaction_log(OUT, entry->line);
+            transaction_log(TXOUT, entry->line);
             free((void *)entry->line);
             free(entry);
         }
@@ -1723,7 +1728,7 @@ static void * APR_THREAD_FUNC thread_manager(apr_thread_t *thread, void *data)
     return NULL;
 }
 
-
+#ifndef WIN32
 /**
  * Thread to handle all signals
  */
@@ -1740,7 +1745,7 @@ static void * APR_THREAD_FUNC thread_signals(apr_thread_t *thread, void *data)
 
     return NULL;
 }
-
+#endif /* WIN32 */
 
 /**
  * The main loop where we receive log entries from
@@ -1825,7 +1830,7 @@ static void receive_loop(void) {
                     drop_next = 0;
                 }
                 else {
-                    transaction_log(IN, buf + evnt);
+                    transaction_log(TXIN, buf + evnt);
                     error_log(LOG_DEBUG2, NULL, "Received audit log entry (count %lu queue %d workers %d): %s",
                         entry_counter, queue->nelts, current_workers, _log_escape(tmp_pool, (buf + evnt), strlen(buf + evnt)));
                     add_entry(buf + evnt, 1);
@@ -1921,7 +1926,7 @@ static void start_management_thread(void)
         logc_shutdown(1);
     }
 }
-
+#ifndef WIN32
 /**
  * Creates a thread to handle all signals
  */
@@ -1941,6 +1946,7 @@ static void start_signal_thread(void)
         logc_shutdown(1);
     }
 }
+#endif /* WIN32 */
 
 /**
  * Usage text.
@@ -1982,7 +1988,13 @@ int main(int argc, const char * const argv[]) {
     logc_pid = getpid();
     apr_pool_create(&pool, NULL);
     apr_pool_create(&recv_pool, NULL);
+	
+#ifndef WIN32
     apr_setup_signal_thread();
+#else
+	apr_signal(SIGINT, handle_signals);
+	apr_signal(SIGTERM, handle_signals);
+#endif /* WIN32 */
 
     if (argc < 2) {
         usage();
@@ -2034,7 +2046,9 @@ int main(int argc, const char * const argv[]) {
     server_error = 0;
 
     start_management_thread();
+#ifndef WIN32
     start_signal_thread();
+#endif /* WIN32 */
 
     /* Process stdin until EOF */
     receive_loop();
diff --git a/apache2/msc_util.c b/apache2/msc_util.c
index c7e40c66..15120401 100644
--- a/apache2/msc_util.c
+++ b/apache2/msc_util.c
@@ -27,12 +27,28 @@
 
 #include <apr_lib.h>
 
-/* NOTE: Be careful as these can ONLY be used on static values for X.
+/**
+ * NOTE: Be careful as these can ONLY be used on static values for X.
  * (i.e. VALID_HEX(c++) will NOT work)
  */
 #define VALID_HEX(X) (((X >= '0')&&(X <= '9')) || ((X >= 'a')&&(X <= 'f')) || ((X >= 'A')&&(X <= 'F')))
 #define ISODIGIT(X) ((X >= '0')&&(X <= '7'))
 
+#if (defined(WIN32) || defined(NETWARE))
+/** Windows does not define all the octal modes */
+#define S_IXOTH 00001
+#define S_IWOTH 00002
+#define S_IROTH 00004
+#define S_IXGRP 00010
+#define S_IWGRP 00020
+#define S_IRGRP 00040
+#define S_IXUSR 00100
+#define S_IWUSR 00200
+#define S_IRUSR 00400
+#define S_ISVTX 01000
+#define S_ISGID 02000
+#define S_ISUID 04000
+#endif /* defined(WIN32 || NETWARE) */
 
 /**
  *
@@ -418,7 +434,7 @@ char *current_filetime(apr_pool_t *mp) {
 /**
  *
  */
-int msc_mkstemp_ex(char *template, mode_t mode) {
+int msc_mkstemp_ex(char *template, int mode) {
     /* ENH Use apr_file_mktemp instead. */
 
     #if !(defined(WIN32)||defined(NETWARE))
@@ -669,7 +685,7 @@ int js_decode_nonstrict_inplace(unsigned char *input, long int input_len) {
                         j = 2;
                         buf[j] = '\0';
                     }
-                    *d++ = strtol(buf, NULL, 8);
+                    *d++ = (unsigned char)strtol(buf, NULL, 8);
                     i += 1 + j;
                     count++;
                 }
@@ -1362,7 +1378,7 @@ int css_decode_inplace(unsigned char *input, long int input_len) {
 /**
  * Translate UNIX octal umask/mode to APR apr_fileperms_t
  */
-apr_fileperms_t mode2fileperms(mode_t mode) {
+apr_fileperms_t mode2fileperms(int mode) {
     apr_fileperms_t perms = 0;
 
     if (mode & S_IXOTH) perms |= APR_WEXECUTE;
diff --git a/apache2/msc_util.h b/apache2/msc_util.h
index 6811cff1..f91ec3ae 100644
--- a/apache2/msc_util.h
+++ b/apache2/msc_util.h
@@ -56,7 +56,7 @@ char DSOLOCAL *current_logtime(apr_pool_t *mp);
 
 char DSOLOCAL *current_filetime(apr_pool_t *mp);
 
-int DSOLOCAL msc_mkstemp_ex(char *template, mode_t mode);
+int DSOLOCAL msc_mkstemp_ex(char *template, int mode);
 
 int DSOLOCAL msc_mkstemp(char *template);
 
@@ -99,6 +99,6 @@ char DSOLOCAL *resolve_relative_path(apr_pool_t *pool, const char *parent_filena
 
 int DSOLOCAL css_decode_inplace(unsigned char *input, long int input_len);
 
-apr_fileperms_t DSOLOCAL mode2fileperms(mode_t mode);
+apr_fileperms_t DSOLOCAL mode2fileperms(int mode);
 
 #endif
diff --git a/apache2/t/run-regression-tests.pl.in b/apache2/t/run-regression-tests.pl.in
index f41d2b62..15614e94 100755
--- a/apache2/t/run-regression-tests.pl.in
+++ b/apache2/t/run-regression-tests.pl.in
@@ -5,8 +5,8 @@
 # Syntax: run-regression-tests.pl [options] [file [N]]
 #
 #          All: run-regression-tests.pl
-#	 All in file: run-regression-tests.pl file
-#	 Nth in file: run-regression-tests.pl file N
+#   All in file: run-regression-tests.pl file
+#   Nth in file: run-regression-tests.pl file N
 #
 use strict;
 use Time::HiRes qw(gettimeofday sleep);
@@ -45,8 +45,8 @@ $UA->agent($UA_NAME);
 
 # Hack for testing the script w/o configure
 if ($HTTPD eq "\@APXS_HTTPD\@") {
-	$HTTPD = "/usr/local/apache2/bin/httpd";
-	$MODULES_DIR = "/usr/local/apache2/modules";
+    $HTTPD = "/usr/local/apache2/bin/httpd";
+    $MODULES_DIR = "/usr/local/apache2/modules";
 }
 
 $SIG{TERM} = $SIG{INT} = \&handle_interrupt;
@@ -55,14 +55,14 @@ my %opt;
 getopts('A:E:D:C:T:H:a:p:dvh', \%opt);
 
 if ($opt{d}) {
-	$Data::Dumper::Indent = 1;
-	$Data::Dumper::Terse = 1;
-	$Data::Dumper::Pad = "";
-	$Data::Dumper::Quotekeys = 0;
+    $Data::Dumper::Indent = 1;
+    $Data::Dumper::Terse = 1;
+    $Data::Dumper::Pad = "";
+    $Data::Dumper::Quotekeys = 0;
 }
 
 sub usage {
-	print stderr <<"EOT";
+    print stderr <<"EOT";
 @_
 Usage: $SCRIPT [options] [file [N]]
 
@@ -81,17 +81,17 @@ Usage: $SCRIPT [options] [file [N]]
 
 EOT
 
-  exit(1);
+    exit(1);
 }
 
 usage() if ($opt{h});
 
 ### Check httpd binary
 if (defined $opt{a}) {
-	$HTTPD = $opt{a};
+    $HTTPD = $opt{a};
 }
 else {
-	$opt{a} = $HTTPD;
+    $opt{a} = $HTTPD;
 }
 usage("Invalid Apache startup script: $HTTPD\n") unless (-e $HTTPD);
 
@@ -105,673 +105,675 @@ $opt{p} = 8088 unless (defined $opt{p});
 $opt{v} = 1 if ($opt{d});
 
 unless (defined $opt{S}) {
-	my $httpd_root = `$HTTPD -V`;
-	($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
+    my $httpd_root = `$HTTPD -V`;
+    ($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
 }
 
 %ENV = (
-	%ENV,
-	SERVER_ROOT => $opt{S},
-	SERVER_PORT => $opt{p},
-	SERVER_NAME => "localhost",
-	TEST_SERVER_ROOT => $SROOT_DIR,
-	DATA_DIR => $DATA_DIR,
-	TEMP_DIR => $TEMP_DIR,
-	UPLOAD_DIR => $UPLOAD_DIR,
-	CONF_DIR => $CONF_DIR,
-	MODULES_DIR => $MODULES_DIR,
-	LOGS_DIR => $FILES_DIR,
-	SCRIPT_DIR => $SCRIPT_DIR,
-	REGRESSION_DIR => $REG_DIR,
-	DIST_ROOT => File::Spec->rel2abs(dirname("$SCRIPT_DIR/../../..")),
-	AUDIT_LOG => $opt{A},
-	DEBUG_LOG => $opt{D},
-	ERROR_LOG => $opt{E},
-	HTTPD_CONF => $opt{C},
-	HTDOCS => $opt{H},
-	USER_AGENT => $UA_NAME,
+    %ENV,
+    SERVER_ROOT => $opt{S},
+    SERVER_PORT => $opt{p},
+    SERVER_NAME => "localhost",
+    TEST_SERVER_ROOT => $SROOT_DIR,
+    DATA_DIR => $DATA_DIR,
+    TEMP_DIR => $TEMP_DIR,
+    UPLOAD_DIR => $UPLOAD_DIR,
+    CONF_DIR => $CONF_DIR,
+    MODULES_DIR => $MODULES_DIR,
+    LOGS_DIR => $FILES_DIR,
+    SCRIPT_DIR => $SCRIPT_DIR,
+    REGRESSION_DIR => $REG_DIR,
+    DIST_ROOT => File::Spec->rel2abs(dirname("$SCRIPT_DIR/../../..")),
+    AUDIT_LOG => $opt{A},
+    DEBUG_LOG => $opt{D},
+    ERROR_LOG => $opt{E},
+    HTTPD_CONF => $opt{C},
+    HTDOCS => $opt{H},
+    USER_AGENT => $UA_NAME,
 );
 
 #dbg("OPTIONS: ", \%opt);
 
 if (-e "$PID_FILE") {
-	msg("Shutting down previous instance: $PID_FILE");
-	httpd_stop();
+    msg("Shutting down previous instance: $PID_FILE");
+    httpd_stop();
 }
 
 if (defined $ARGV[0]) {
-	runfile(dirname($ARGV[0]), basename($ARGV[0]), $ARGV[1]);
-	done();
+    runfile(dirname($ARGV[0]), basename($ARGV[0]), $ARGV[1]);
+    done();
 }
 
 for my $type (@TYPES) {
-	my $dir = "$SCRIPT_DIR/regression/$type";
-	my @cfg = ();
+    my $dir = "$SCRIPT_DIR/regression/$type";
+    my @cfg = ();
 
-	# Get test names
-	opendir(DIR, "$dir") or quit(1, "Failed to open \"$dir\": $!");
-	@cfg = grep { /\.t$/ && -f "$dir/$_" } readdir(DIR);
-	closedir(DIR);
-
-	for my $cfg (sort @cfg) {
-		runfile($dir, $cfg);
-	}
+    # Get test names
+    opendir(DIR, "$dir") or quit(1, "Failed to open \"$dir\": $!");
+    @cfg = grep { /\.t$/ && -f "$dir/$_" } readdir(DIR);
+    closedir(DIR);
 
+    for my $cfg (sort @cfg) {
+        runfile($dir, $cfg);
+    }
 }
 done();
 
 
 sub runfile {
-	my($dir, $cfg, $testnum) = @_;
-	my $fn = "$dir/$cfg";
-	my @data = ();
-	my $edata;
-	my @C = ();
-	my @test = ();
-	my $teststr;
-	my $n = 0;
-	my $pass = 0;
+    my($dir, $cfg, $testnum) = @_;
+    my $fn = "$dir/$cfg";
+    my @data = ();
+    my $edata;
+    my @C = ();
+    my @test = ();
+    my $teststr;
+    my $n = 0;
+    my $pass = 0;
 
-	open(CFG, "<$fn") or quit(1, "Failed to open \"$fn\": $!");
-	@data = <CFG>;
-	
-	$edata = q/@C = (/ . join("", @data) . q/)/;
-	eval $edata;
-	quit(1, "Failed to read test data \"$cfg\": $@") if ($@);
+    open(CFG, "<$fn") or quit(1, "Failed to open \"$fn\": $!");
+    @data = <CFG>;
+  
+    $edata = q/@C = (/ . join("", @data) . q/)/;
+    eval $edata;
+    quit(1, "Failed to read test data \"$cfg\": $@") if ($@);
 
-	unless (@C) {
-		msg("\nNo tests defined for $fn");
-		return;
-	}
+    unless (@C) {
+        msg("\nNo tests defined for $fn");
+        return;
+    }
 
-	msg("\nLoaded ".@C." tests from $fn");
-	for my $t (@C) {
-		$n++;
-		next if (defined $testnum and $n != $testnum);
+    msg("\nLoaded ".@C." tests from $fn");
+    for my $t (@C) {
+        $n++;
+        next if (defined $testnum and $n != $testnum);
 
-		my $httpd_up = 0;
-		my %t = %{$t || {}};
-		my $id = sprintf("%3d", $n);
-		my $out = "";
-		my $rc = 0;
-		my $conf_fn;
+        my $httpd_up = 0;
+        my %t = %{$t || {}};
+        my $id = sprintf("%3d", $n);
+        my $out = "";
+        my $rc = 0;
+        my $conf_fn;
 
-		# Startup httpd with optionally included conf.
-		if (exists $t{conf} and defined $t{conf}) {
-			$conf_fn = sprintf "%s/%s_%s_%06d.conf",
-			                   $CONF_DIR, $t{type}, $cfg, $n;
-			#dbg("Writing test config to: $conf_fn");
-			open(CONF, ">$conf_fn") or die "Failed to open conf \"$conf_fn\": $!\n";
-			print CONF (ref $t{conf} eq "CODE" ? eval { &{$t{conf}} } : $t{conf});
-			msg("$@") if ($@);
-			close CONF;
-			$httpd_up = httpd_start(\%t, "Include $conf_fn") ? 0 : 1;
-		}
-		else {
-			$httpd_up = httpd_start(\%t) ? 0 : 1;
-		}
+        # Startup httpd with optionally included conf.
+        if (exists $t{conf} and defined $t{conf}) {
+            $conf_fn = sprintf "%s/%s_%s_%06d.conf",
+                         $CONF_DIR, $t{type}, $cfg, $n;
+            #dbg("Writing test config to: $conf_fn");
+            open(CONF, ">$conf_fn") or die "Failed to open conf \"$conf_fn\": $!\n";
+            print CONF (ref $t{conf} eq "CODE" ? eval { &{$t{conf}} } : $t{conf});
+            msg("$@") if ($@);
+            close CONF;
+            $httpd_up = httpd_start(\%t, "Include $conf_fn") ? 0 : 1;
+        }
+        else {
+            $httpd_up = httpd_start(\%t) ? 0 : 1;
+        }
 
-		# Run any prerun setup
-		if ($rc == 0 and exists $t{prerun} and defined $t{prerun}) {
-			vrb("Executing perl prerun...");
-			$rc = &{$t{prerun}};
-			vrb("Perl prerun returned: $rc");
-		}
+        # Run any prerun setup
+        if ($rc == 0 and exists $t{prerun} and defined $t{prerun}) {
+            vrb("Executing perl prerun...");
+            $rc = &{$t{prerun}};
+            vrb("Perl prerun returned: $rc");
+        }
 
-		if ($httpd_up) {
-			# Perform the request and check response
-			if (exists $t{request}) {
-				my $resp = do_request($t{request});
-				if (!$resp) {
-					msg("invalid response");
-					vrb("RESPONSE: ", $resp);
-					$rc = 1;
-				}
-				else {
-					for my $key (keys %{ $t{match_response} || {}}) {
-						my($neg,$mtype) = ($key =~ m/^(-?)(.*)$/);
-						my $m = $t{match_response}{$key};
-						my $match = match_response($mtype, $resp, $m);
-						if ($neg and defined $match) {
-							$rc = 1;
-							msg("response $mtype matched: $m");
-							vrb($resp);
-							last;
-						}
-						elsif (!$neg and !defined $match) {
-							$rc = 1;
-							msg("response $mtype failed to match: $m");
-							vrb($resp);
-							last;
-						}
-					}
-				}
-			}
+        if ($httpd_up) {
+            # Perform the request and check response
+            if (exists $t{request}) {
+                my $resp = do_request($t{request});
+                if (!$resp) {
+                    msg("invalid response");
+                    vrb("RESPONSE: ", $resp);
+                    $rc = 1;
+                }
+                else {
+                    for my $key (keys %{ $t{match_response} || {}}) {
+                        my($neg,$mtype) = ($key =~ m/^(-?)(.*)$/);
+                        my $m = $t{match_response}{$key};
+                        my $match = match_response($mtype, $resp, $m);
+                        if ($neg and defined $match) {
+                            $rc = 1;
+                            msg("response $mtype matched: $m");
+                            vrb($resp);
+                            last;
+                        }
+                        elsif (!$neg and !defined $match) {
+                            $rc = 1;
+                            msg("response $mtype failed to match: $m");
+                            vrb($resp);
+                            last;
+                        }
+                    }
+                }
+            }
 
-			# Run any arbitrary perl tests
-			if ($rc == 0 and exists $t{test} and defined $t{test}) {
-				dbg("Executing perl test(s)...");
-				$rc = eval { &{$t{test}} };
-				if (! defined $rc) {
-					msg("Error running test: $@");
-					$rc = -1;
-				}
-				dbg("Perl tests returned: $rc");
-			}
+            # Run any arbitrary perl tests
+            if ($rc == 0 and exists $t{test} and defined $t{test}) {
+                dbg("Executing perl test(s)...");
+                $rc = eval { &{$t{test}} };
+                if (! defined $rc) {
+                    msg("Error running test: $@");
+                    $rc = -1;
+                }
+                dbg("Perl tests returned: $rc");
+            }
 
-			# Search for all log matches
-			if ($rc == 0 and exists $t{match_log} and defined $t{match_log}) {
-				for my $key (keys %{ $t{match_log} || {}}) {
-					my($neg,$mtype) = ($key =~ m/^(-?)(.*)$/);
-					my $m = $t{match_log}{$key};
-					my $match = match_log($mtype, @{$m || []});
-					if ($neg and defined $match) {
-						$rc = 1;
-						msg("$mtype log matched: $m->[0]");
-						last;
-					}
-					elsif (!$neg and !defined $match) {
-						$rc = 1;
-						msg("$mtype log failed to match: $m->[0]");
-						last;
-					}
-				}
-			}
+            # Search for all log matches
+            if ($rc == 0 and exists $t{match_log} and defined $t{match_log}) {
+                for my $key (keys %{ $t{match_log} || {}}) {
+                    my($neg,$mtype) = ($key =~ m/^(-?)(.*)$/);
+                    my $m = $t{match_log}{$key};
+                    my $match = match_log($mtype, @{$m || []});
+                    if ($neg and defined $match) {
+                        $rc = 1;
+                        msg("$mtype log matched: $m->[0]");
+                        last;
+                    }
+                    elsif (!$neg and !defined $match) {
+                        $rc = 1;
+                        msg("$mtype log failed to match: $m->[0]");
+                        last;
+                    }
+                }
+            }
 
-			# Search for all file matches
-			if ($rc == 0 and exists $t{match_file} and defined $t{match_file}) {
-				sleep 1; # Make sure the file exists
-				for my $key (keys %{ $t{match_file} || {}}) {
-					my($neg,$fn) = ($key =~ m/^(-?)(.*)$/);
-					my $m = $t{match_file}{$key};
-					my $match = match_file($fn, $m);
-					if ($neg and defined $match) {
-						$rc = 1;
-						msg("$fn file matched: $m");
-						last;
-					}
-					elsif (!$neg and !defined $match) {
-						$rc = 1;
-						msg("$fn file failed match: $m");
-						last;
-					}
-				}
-			}
-		}
-		else {
-			msg("Failed to start httpd.");
-			$rc = 1;
-		}
+            # Search for all file matches
+            if ($rc == 0 and exists $t{match_file} and defined $t{match_file}) {
+                sleep 1; # Make sure the file exists
+                for my $key (keys %{ $t{match_file} || {}}) {
+                    my($neg,$fn) = ($key =~ m/^(-?)(.*)$/);
+                    my $m = $t{match_file}{$key};
+                    my $match = match_file($fn, $m);
+                    if ($neg and defined $match) {
+                        $rc = 1;
+                        msg("$fn file matched: $m");
+                        last;
+                    }
+                    elsif (!$neg and !defined $match) {
+                        $rc = 1;
+                        msg("$fn file failed match: $m");
+                        last;
+                    }
+                }
+            }
+        }
+        else {
+            msg("Failed to start httpd.");
+            $rc = 1;
+        }
 
-		if ($rc == 0) {
-			$pass++;
-		}
-		else {
-			vrb("Test Config: $conf_fn");
-			vrb("Debug Log: $FILE{debug}{fn}");
-			dbg(escape("$FILE{debug}{buf}"));
-			vrb("Error Log: $FILE{error}{fn}");
-			dbg(escape("$FILE{error}{buf}"));
-		}
+        if ($rc == 0) {
+            $pass++;
+        }
+        else {
+            vrb("Test Config: $conf_fn");
+            vrb("Debug Log: $FILE{debug}{fn}");
+            dbg(escape("$FILE{debug}{buf}"));
+            vrb("Error Log: $FILE{error}{fn}");
+            dbg(escape("$FILE{error}{buf}"));
+        }
 
-		msg(sprintf("%s) %s%s: %s%s", $id, $t{type}, (exists($t{comment}) ? " - $t{comment}" : ""), ($rc ? "failed" : "passed"), ((defined($out) && $out ne "")? " ($out)" : "")));
-		
-		if ($httpd_up) {
-			$httpd_up = httpd_stop(\%t) ? 0 : 1;
-		}
+        msg(sprintf("%s) %s%s: %s%s", $id, $t{type}, (exists($t{comment}) ? " - $t{comment}" : ""), ($rc ? "failed" : "passed"), ((defined($out) && $out ne "")? " ($out)" : "")));
+    
+        if ($httpd_up) {
+            $httpd_up = httpd_stop(\%t) ? 0 : 1;
+        }
 
-	}
+    }
 
-	$TOTAL += $testnum ? 1 : $n;
-	$PASSED += $pass;
+    $TOTAL += $testnum ? 1 : $n;
+    $PASSED += $pass;
 
-	msg(sprintf("Passed: %2d; Failed: %2d", $pass, $testnum ? (1 - $pass) : ($n - $pass)));
+    msg(sprintf("Passed: %2d; Failed: %2d", $pass, $testnum ? (1 - $pass) : ($n - $pass)));
 }
 
 # Take out any indenting and translate LF -> CRLF
 sub normalize_raw_request_data {
-	my $r = $_[0];
+    my $r = $_[0];
 
-	# Allow for indenting in test file
-	$r =~ s/^[ \t]*\x0d?\x0a//s;
-	my($indention) = ($r =~ m/^([ \t]*)/s); # indention taken from first line
-	$r =~ s/^$indention//mg;
-	$r =~ s/(\x0d?\x0a)[ \t]+$/$1/s;
+    # Allow for indenting in test file
+    $r =~ s/^[ \t]*\x0d?\x0a//s;
+    my($indention) = ($r =~ m/^([ \t]*)/s); # indention taken from first line
+    $r =~ s/^$indention//mg;
+    $r =~ s/(\x0d?\x0a)[ \t]+$/$1/s;
 
-	# Translate LF to CRLF
-	$r =~ s/^\x0a/\x0d\x0a/mg;
-	$r =~ s/([^\x0d])\x0a/$1\x0d\x0a/mg;
+    # Translate LF to CRLF
+    $r =~ s/^\x0a/\x0d\x0a/mg;
+    $r =~ s/([^\x0d])\x0a/$1\x0d\x0a/mg;
 
-	return $r;
+    return $r;
 }
 
 sub do_raw_request {
-	my $sock = new IO::Socket::INET(
-		Proto => "tcp",
-		PeerAddr => "localhost",
-		PeerPort => $opt{p},
-	) or msg("Failed to connect to localhost:$opt{p}: $@");
-	return unless ($sock);
+    my $sock = new IO::Socket::INET(
+        Proto => "tcp",
+        PeerAddr => "localhost",
+        PeerPort => $opt{p},
+    ) or msg("Failed to connect to localhost:$opt{p}: $@");
+    return unless ($sock);
 
-	# Join togeather the request
-	my $r = join("", @_);
-	dbg($r);
+    # Join togeather the request
+    my $r = join("", @_);
+    dbg($r);
 
-	# Write to socket
-	print $sock "$r";
-	$sock->shutdown(1);
+    # Write to socket
+    print $sock "$r";
+    $sock->shutdown(1);
 
-	# Read from socket
-	my @resp = <$sock>;
-	$sock->close();
+    # Read from socket
+    my @resp = <$sock>;
+    $sock->close();
 
-	return HTTP::Response->parse(join("", @resp));
+    return HTTP::Response->parse(join("", @resp));
 }
 
 sub do_request {
-	my $r = $_[0];
-	
-	# Allow test to execute code
-	if (ref $r eq "CODE") {
-		$r = eval { &$r };
-		msg("$@") unless (defined $r);
-	}
+    my $r = $_[0];
+  
+    # Allow test to execute code
+    if (ref $r eq "CODE") {
+        $r = eval { &$r };
+        msg("$@") unless (defined $r);
+    }
 
-	if (ref $r eq "HTTP::Request") {
-		my $resp = $UA->request($r);
-		dbg($resp->request()->as_string()) if ($opt{d});
-		return $resp
-	}
-	else {
-		return do_raw_request($r);
-	}
+    if (ref $r eq "HTTP::Request") {
+        my $resp = $UA->request($r);
+        dbg($resp->request()->as_string()) if ($opt{d});
+        return $resp
+    }
+    else {
+        return do_raw_request($r);
+    }
 
-	return;
+    return;
 }
 
 
 sub match_response {
-	my($name, $resp, $re) = @_;
+    my($name, $resp, $re) = @_;
 
-	msg("Warning: Empty regular expression.") if (!defined $re or $re eq "");
+    msg("Warning: Empty regular expression.") if (!defined $re or $re eq "");
 
-	if ($name eq "status") {
-		return $& if ($resp->code =~ m/$re/);
-	}
-	elsif ($name eq "content") {
-		return $& if ($resp->content =~ m/$re/m);
-	}
-	elsif ($name eq "raw") {
-		return $& if ($resp->as_string =~ m/$re/m);
-	}
+    if ($name eq "status") {
+        return $& if ($resp->code =~ m/$re/);
+    }
+    elsif ($name eq "content") {
+        return $& if ($resp->content =~ m/$re/m);
+    }
+    elsif ($name eq "raw") {
+        return $& if ($resp->as_string =~ m/$re/m);
+    }
 
-	return;
+    return;
 }
 
 sub read_log {
-	my($name, $timeout, $graph) = @_;
-	return match_log($name, undef, $timeout, $graph);
+    my($name, $timeout, $graph) = @_;
+    return match_log($name, undef, $timeout, $graph);
 }
 
 sub match_log {
-	my($name, $re, $timeout, $graph) = @_;
-	my $t0 = gettimeofday;
-	my($fh,$rbuf) = ($FILE{$name}{fd}, \$FILE{$name}{buf});
-	my $n = length($$rbuf);
-	my $rc = undef;
+    my($name, $re, $timeout, $graph) = @_;
+    my $t0 = gettimeofday;
+    my($fh,$rbuf) = ($FILE{$name}{fd}, \$FILE{$name}{buf});
+    my $n = length($$rbuf);
+    my $rc = undef;
 
-  unless (defined $fh) {
-    msg("Error: File \"$name\" is not opened for matching.");
-    return;
-  }
+    unless (defined $fh) {
+        msg("Error: File \"$name\" is not opened for matching.");
+        return;
+    }
 
-	$timeout = 0 unless (defined $timeout);
+    $timeout = 0 unless (defined $timeout);
 
-	my $i = 0;
-	my $graphed = 0;
-	READ: {
-		do {
-			my $nbytes = $fh->sysread($$rbuf, $BUFSIZ, $n);
-			if (!defined($nbytes)) {
-				msg("Error: Could not read \"$name\" log: $!");
-				last;
-			}
-			elsif (!defined($re) and $nbytes == 0) {
-				last;
-			}
+    my $i = 0;
+    my $graphed = 0;
+    READ: {
+        do {
+            my $nbytes = $fh->sysread($$rbuf, $BUFSIZ, $n);
+            if (!defined($nbytes)) {
+                msg("Error: Could not read \"$name\" log: $!");
+                last;
+            }
+            elsif (!defined($re) and $nbytes == 0) {
+                last;
+            }
 
-			# Remove APR pool debugging
-			$$rbuf =~ s/POOL DEBUG:[^\n]+PALLOC[^\n]+\n//sg;
+            # Remove APR pool debugging
+            $$rbuf =~ s/POOL DEBUG:[^\n]+PALLOC[^\n]+\n//sg;
 
-			$n = length($$rbuf);
+            $n = length($$rbuf);
 
-			#dbg("Match \"$re\" in $name \"$$rbuf\" ($n)");
-			if ($$rbuf =~ m/$re/m) {
-				$rc = $&;
-				last;
-			}
-			# TODO: Use select()/poll()
-			sleep 0.1 unless ($nbytes == $BUFSIZ);
-			if ($graph and $opt{d}) {
-				$i++;
-				if ($i == 10) {
-					$graphed++;
-					$i=0;
-					print STDERR $graph if ($graphed == 1);
-					print STDERR "."
-				}
-			}
-		} while (gettimeofday - $t0 < $timeout);
-	}
-	print STDERR "\n" if ($graphed);
+            #dbg("Match \"$re\" in $name \"$$rbuf\" ($n)");
+            if ($$rbuf =~ m/$re/m) {
+                $rc = $&;
+                last;
+            }
+            # TODO: Use select()/poll()
+            sleep 0.1 unless ($nbytes == $BUFSIZ);
+            if ($graph and $opt{d}) {
+                $i++;
+                if ($i == 10) {
+                    $graphed++;
+                    $i=0;
+                    print STDERR $graph if ($graphed == 1);
+                    print STDERR "."
+                }
+            }
+        } while (gettimeofday - $t0 < $timeout);
+    }
+    print STDERR "\n" if ($graphed);
 
-	return $rc;
+    return $rc;
 }
 
 sub match_file {
-	my($neg,$fn) = ($_[0] =~ m/^(-?)(.*)$/);
-	unless (exists $FILE{$fn}) {
-		eval {
-			$FILE{$fn}{fn} = $fn;
-			$FILE{$fn}{fd} = new FileHandle($fn, O_RDONLY) or die "$!\n";
-			$FILE{$fn}{fd}->blocking(0);
-			$FILE{$fn}{buf} = "";
-		};
-		if ($@) {
-			msg("Warning: Failed to open file \"$fn\": $@");
-			return;
-		}
-	}
-	return match_log($_[0], $_[1]); # timeout makes no sense
+    my($neg,$fn) = ($_[0] =~ m/^(-?)(.*)$/);
+    unless (exists $FILE{$fn}) {
+        eval {
+            $FILE{$fn}{fn} = $fn;
+            $FILE{$fn}{fd} = new FileHandle($fn, O_RDONLY) or die "$!\n";
+            $FILE{$fn}{fd}->blocking(0);
+            $FILE{$fn}{buf} = "";
+        };
+        if ($@) {
+            msg("Warning: Failed to open file \"$fn\": $@");
+            return;
+        }
+    }
+    return match_log($_[0], $_[1]); # timeout makes no sense
 }
 
 sub quote_shell {
-	my($s) = @_;
-	return $s unless ($s =~ m|[^\w!%+,\-./:@^]|);
-	$s =~ s/(['\\])/\\$1/g;
-	return "'$s'";
+    my($s) = @_;
+    return $s unless ($s =~ m|[^\w!%+,\-./:@^]|);
+    $s =~ s/(['\\])/\\$1/g;
+    return "'$s'";
 }
 
 sub escape {
-	my @new = ();
-	for my $c (split(//, $_[0])) {
-		my $oc = ord($c);
-		push @new, ((($oc >= 0x20 and $oc <= 0x7e) or $oc == 0x0a or $oc == 0x0d) ? $c : sprintf("\\x%02x", ord($c)));
-	}
-	join('', @new);
+    my @new = ();
+    for my $c (split(//, $_[0])) {
+        my $oc = ord($c);
+        push @new, ((($oc >= 0x20 and $oc <= 0x7e) or $oc == 0x0a or $oc == 0x0d) ? $c : sprintf("\\x%02x", ord($c)));
+    }
+    join('', @new);
 }
 
 sub dbg {
-	return unless(@_ and $opt{d});
-	my $out = join "", map {
-		(ref $_ ne "" ? Dumper($_) : $_)
-	} @_;
-	$out =~ s/^/DBG: /mg;
-	print STDOUT "$out\n";
+    return unless(@_ and $opt{d});
+    my $out = join "", map {
+        (ref $_ ne "" ? Dumper($_) : $_)
+    } @_;
+    $out =~ s/^/DBG: /mg;
+    print STDOUT "$out\n";
 }
 
 sub vrb {
-	return unless(@_ and $opt{v});
-	msg(@_);
+    return unless(@_ and $opt{v});
+    msg(@_);
 }
 
 sub msg {
-	return unless(@_);
-	my $out = join "", map {
-		(ref $_ ne "" ? Dumper($_) : $_)
-	} @_;
-	print STDOUT "$out\n";
+    return unless(@_);
+    my $out = join "", map {
+        (ref $_ ne "" ? Dumper($_) : $_)
+    } @_;
+    print STDOUT "$out\n";
 }
 
 sub handle_interrupt {
-	$SIG{TERM} = $SIG{INT} = \&handle_interrupt;
+    $SIG{TERM} = $SIG{INT} = \&handle_interrupt;
 
-	msg("Interrupted via SIG$_[0].  Shutting down tests...");
-	httpd_stop();
+    msg("Interrupted via SIG$_[0].  Shutting down tests...");
+    httpd_stop();
 
-	quit(1);
+    quit(1);
 }
 
 sub quit {
-	my($ec,$msg) = @_;
-	$ec = 0 unless (defined $_[0]);
+    my($ec,$msg) = @_;
+    $ec = 0 unless (defined $_[0]);
 
-	msg("$msg") if (defined $msg);
+    msg("$msg") if (defined $msg);
 
-	exit $ec;
+    exit $ec;
 }
 
 sub done {
-	if ($PASSED != $TOTAL) {
-		quit(1, "\n$PASSED/$TOTAL tests passed.");
-	}
+    if ($PASSED != $TOTAL) {
+        quit(1, "\n$PASSED/$TOTAL tests passed.");
+    }
 
-	quit(0, "\nAll tests passed ($TOTAL).");
+    quit(0, "\nAll tests passed ($TOTAL).");
 }
 
 sub httpd_start {
-	my $t = shift;
-	httpd_reset_fd($t);
-	my @p = (
-		$HTTPD,
-		-d => $opt{S},
-		-f => $opt{C},
-		(map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
-		-k => "start",
-	);
+    my $t = shift;
+    httpd_reset_fd($t);
+    my @p = (
+        $HTTPD,
+        -d => $opt{S},
+        -f => $opt{C},
+        (map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
+        -k => "start",
+    );
 
-	my $httpd_out;
-	my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
-	my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
-	close $httpd_out;
-	waitpid($httpd_pid, 0);
+    my $httpd_out;
+    my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
+    my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
+    close $httpd_out;
+    waitpid($httpd_pid, 0);
 
-	my $rc = $?;
-	if ( WIFEXITED($rc) ) {
-		$rc = WEXITSTATUS($rc);
-		vrb("Httpd start returned with $rc.") if ($rc);
-	}
-	elsif( WIFSIGNALED($rc) ) {
-		msg("Httpd start failed with signal " . WTERMSIG($rc) . ".");
-		$rc = -1;
-	}
-	else {
-		msg("Httpd start failed with unknown error.");
-		$rc = -1;
-	}
+    my $rc = $?;
+    if ( WIFEXITED($rc) ) {
+        $rc = WEXITSTATUS($rc);
+        vrb("Httpd start returned with $rc.") if ($rc);
+    }
+    elsif( WIFSIGNALED($rc) ) {
+        msg("Httpd start failed with signal " . WTERMSIG($rc) . ".");
+        $rc = -1;
+    }
+    else {
+        msg("Httpd start failed with unknown error.");
+        $rc = -1;
+    }
 
-	if (defined $out and $out ne "") {
-		vrb(join(" ", map { quote_shell($_) } @p));
-		msg("Httpd start failed with error messages:\n$out");
-		return -1
-	}
+    if (defined $out and $out ne "") {
+        vrb(join(" ", map { quote_shell($_) } @p));
+        msg("Httpd start failed with error messages:\n$out");
+        return -1
+    }
 
-	# Look for startup msg
-	unless (defined match_log("error", qr/resuming normal operations/, 60, "Waiting on httpd to start: ")) {
-		vrb(join(" ", map { quote_shell($_) } @p));
-		vrb(match_log("error", qr/(^.*ModSecurity: .*)/sm, 10));
-		msg("Httpd server failed to start.");
-		return -1;
-	}
+    # Look for startup msg
+    unless (defined match_log("error", qr/resuming normal operations/, 60, "Waiting on httpd to start: ")) {
+        vrb(join(" ", map { quote_shell($_) } @p));
+        vrb(match_log("error", qr/(^.*ModSecurity: .*)/sm, 10));
+        msg("Httpd server failed to start.");
+        return -1;
+    }
 
-	return $rc;
+    return $rc;
 }
 
 sub httpd_stop {
-	my $t = shift;
-	my @p = (
-		$HTTPD,
-		-d => $opt{S},
-		-f => $opt{C},
-		(map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
-		-k => "stop",
-	);
+    my $t = shift;
+    my @p = (
+        $HTTPD,
+        -d => $opt{S},
+        -f => $opt{C},
+        (map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
+        -k => "stop",
+    );
 
-	my $httpd_out;
-	my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
-	my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
-	close $httpd_out;
-	waitpid($httpd_pid, 0);
+    my $httpd_out;
+    my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
+    my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
+    close $httpd_out;
+    waitpid($httpd_pid, 0);
 
-	if (defined $out and $out ne "") {
-		msg("Httpd stop failed with error messages:\n$out");
-		return -1
-	}
+    if (defined $out and $out ne "") {
+        msg("Httpd stop failed with error messages:\n$out");
+        return -1
+    }
 
-	my $rc = $?;
-	if ( WIFEXITED($rc) ) {
-		$rc = WEXITSTATUS($rc);
-		vrb("Httpd stop returned with $rc.") if ($rc);
-	}
-	elsif( WIFSIGNALED($rc) ) {
-		msg("Httpd stop failed with signal " . WTERMSIG($rc) . ".");
-		$rc = -1;
-	}
-	else {
-		msg("Httpd stop failed with unknown error.");
-		$rc = -1;
-	}
+    my $rc = $?;
+    if ( WIFEXITED($rc) ) {
+        $rc = WEXITSTATUS($rc);
+        vrb("Httpd stop returned with $rc.") if ($rc);
+    }
+    elsif( WIFSIGNALED($rc) ) {
+        msg("Httpd stop failed with signal " . WTERMSIG($rc) . ".");
+        $rc = -1;
+    }
+    else {
+        msg("Httpd stop failed with unknown error.");
+        $rc = -1;
+    }
 
-	# Look for startup msg
-	unless (defined match_log("error", qr/caught SIG[A-Z]+, shutting down/, 60, "Waiting on httpd to stop: ")) {
-		vrb(join(" ", map { quote_shell($_) } @p));
-		msg("Httpd server failed to shutdown.");
-		return -1;
-	}
+    # Look for startup msg
+    unless (defined match_log("error", qr/caught SIG[A-Z]+, shutting down/, 60, "Waiting on httpd to stop: ")) {
+        vrb(join(" ", map { quote_shell($_) } @p));
+        msg("Httpd server failed to shutdown.");
+        sleep 0.5;
+        return -1;
+    }
 
-	return $rc;
+    sleep 0.5;
+
+    return $rc;
 }
 
 sub httpd_reload {
-	my $t = shift;
-	httpd_reset_fd($t);
-	my @p = (
-		$HTTPD,
-		-d => $opt{S},
-		-f => $opt{C},
-		(map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
-		-k => "graceful",
-	);
+    my $t = shift;
+    httpd_reset_fd($t);
+    my @p = (
+        $HTTPD,
+        -d => $opt{S},
+        -f => $opt{C},
+        (map { (-c => $_) } ("Listen localhost:$opt{p}", @_)),
+        -k => "graceful",
+    );
 
-	my $httpd_out;
-	my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
-	my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
-	close $httpd_out;
-	waitpid($httpd_pid, 0);
+    my $httpd_out;
+    my $httpd_pid = open3(undef, $httpd_out, undef, @p) or quit(1);
+    my $out = join("\\n", grep(!/POOL DEBUG/, (<$httpd_out>)));
+    close $httpd_out;
+    waitpid($httpd_pid, 0);
 
-	if (defined $out and $out ne "") {
-		msg("Httpd reload failed with error messages:\n$out");
-		return -1
-	}
+    if (defined $out and $out ne "") {
+        msg("Httpd reload failed with error messages:\n$out");
+        return -1
+    }
 
-	my $rc = $?;
-	if ( WIFEXITED($rc) ) {
-		$rc = WEXITSTATUS($rc);
-		vrb("Httpd reload returned with $rc.") if ($rc);
-	}
-	elsif( WIFSIGNALED($rc) ) {
-		msg("Httpd reload failed with signal " . WTERMSIG($rc) . ".");
-		$rc = -1;
-	}
-	else {
-		msg("Httpd reload failed with unknown error.");
-		$rc = -1;
-	}
+    my $rc = $?;
+    if ( WIFEXITED($rc) ) {
+        $rc = WEXITSTATUS($rc);
+        vrb("Httpd reload returned with $rc.") if ($rc);
+    }
+    elsif( WIFSIGNALED($rc) ) {
+        msg("Httpd reload failed with signal " . WTERMSIG($rc) . ".");
+        $rc = -1;
+    }
+    else {
+        msg("Httpd reload failed with unknown error.");
+        $rc = -1;
+    }
 
-	# Look for startup msg
-	unless (defined match_log("error", qr/resuming normal operations/, 60, "Waiting on httpd to restart: ")) {
-		vrb(join(" ", map { quote_shell($_) } @p));
-		msg("Httpd server failed to reload.");
-		return -1;
-	}
+    # Look for startup msg
+    unless (defined match_log("error", qr/resuming normal operations/, 60, "Waiting on httpd to restart: ")) {
+        vrb(join(" ", map { quote_shell($_) } @p));
+        msg("Httpd server failed to reload.");
+        return -1;
+    }
 
-	return $rc;
+    return $rc;
 }
 
 sub httpd_reset_fd {
-	my($t) = @_;
+    my($t) = @_;
 
-	# Cleanup
-	for my $key (keys %FILE) {
-		if (exists $FILE{$key}{fd} and defined $FILE{$key}{fd}) {
-			$FILE{$key}{fd}->close();
-		}
-		delete $FILE{$key};
-	}
+    # Cleanup
+    for my $key (keys %FILE) {
+        if (exists $FILE{$key}{fd} and defined $FILE{$key}{fd}) {
+            $FILE{$key}{fd}->close();
+        }
+        delete $FILE{$key};
+    }
 
-	# Error
-	eval {
-		$FILE{error}{fn} = $opt{E};
-		$FILE{error}{fd} = new FileHandle($opt{E}, O_RDWR|O_CREAT) or die "$!\n";
-		$FILE{error}{fd}->blocking(0);
-		$FILE{error}{fd}->sysseek(0, 2);
-		$FILE{error}{buf} = "";
-	};
-	if ($@) {
-		msg("Warning: Failed to open file \"$opt{E}\": $@");
-		return undef;
-	}
+    # Error
+    eval {
+        $FILE{error}{fn} = $opt{E};
+        $FILE{error}{fd} = new FileHandle($opt{E}, O_RDWR|O_CREAT) or die "$!\n";
+        $FILE{error}{fd}->blocking(0);
+        $FILE{error}{fd}->sysseek(0, 2);
+        $FILE{error}{buf} = "";
+    };
+    if ($@) {
+        msg("Warning: Failed to open file \"$opt{E}\": $@");
+        return undef;
+    }
 
-	# Audit
-	eval {
-		$FILE{audit}{fn} = $opt{A};
-		$FILE{audit}{fd} = new FileHandle($opt{A}, O_RDWR|O_CREAT) or die "$!\n";
-		$FILE{audit}{fd}->blocking(0);
-		$FILE{audit}{fd}->sysseek(0, 2);
-		$FILE{audit}{buf} = "";
-	};
-	if ($@) {
-		msg("Warning: Failed to open file \"$opt{A}\": $@");
-		return undef;
-	}
+    # Audit
+    eval {
+        $FILE{audit}{fn} = $opt{A};
+        $FILE{audit}{fd} = new FileHandle($opt{A}, O_RDWR|O_CREAT) or die "$!\n";
+        $FILE{audit}{fd}->blocking(0);
+        $FILE{audit}{fd}->sysseek(0, 2);
+        $FILE{audit}{buf} = "";
+    };
+    if ($@) {
+        msg("Warning: Failed to open file \"$opt{A}\": $@");
+        return undef;
+    }
 
-	# Debug
-	eval {
-		$FILE{debug}{fn} = $opt{D};
-		$FILE{debug}{fd} = new FileHandle($opt{D}, O_RDWR|O_CREAT) or die "$!\n";
-		$FILE{debug}{fd}->blocking(0);
-		$FILE{debug}{fd}->sysseek(0, 2);
-		$FILE{debug}{buf} = "";
-	};
-	if ($@) {
-		msg("Warning: Failed to open file \"$opt{D}\": $@");
-		return undef;
-	}
+    # Debug
+    eval {
+        $FILE{debug}{fn} = $opt{D};
+        $FILE{debug}{fd} = new FileHandle($opt{D}, O_RDWR|O_CREAT) or die "$!\n";
+        $FILE{debug}{fd}->blocking(0);
+        $FILE{debug}{fd}->sysseek(0, 2);
+        $FILE{debug}{buf} = "";
+    };
+    if ($@) {
+        msg("Warning: Failed to open file \"$opt{D}\": $@");
+        return undef;
+    }
 
-	# Any extras listed in "match_log"
-	if ($t and exists $t->{match_log}) {
-		for my $k (keys %{ $t->{match_log} || {} }) {
-			my($neg,$fn) = ($k =~ m/^(-?)(.*)$/);
-			next if (!$fn or exists $FILE{$fn});
-			eval {
-				$FILE{$fn}{fn} = $fn;
-				$FILE{$fn}{fd} = new FileHandle($fn, O_RDWR|O_CREAT) or die "$!\n";
-				$FILE{$fn}{fd}->blocking(0);
-				$FILE{$fn}{fd}->sysseek(0, 2);
-				$FILE{$fn}{buf} = "";
-			};
-			if ($@) {
-				msg("Warning: Failed to open file \"$fn\": $@");
-				return undef;
-			}
-		}
-	}
+    # Any extras listed in "match_log"
+    if ($t and exists $t->{match_log}) {
+        for my $k (keys %{ $t->{match_log} || {} }) {
+            my($neg,$fn) = ($k =~ m/^(-?)(.*)$/);
+            next if (!$fn or exists $FILE{$fn});
+            eval {
+                $FILE{$fn}{fn} = $fn;
+                $FILE{$fn}{fd} = new FileHandle($fn, O_RDWR|O_CREAT) or die "$!\n";
+                $FILE{$fn}{fd}->blocking(0);
+                $FILE{$fn}{fd}->sysseek(0, 2);
+                $FILE{$fn}{buf} = "";
+            };
+            if ($@) {
+                msg("Warning: Failed to open file \"$fn\": $@");
+                return undef;
+            }
+        }
+    }
 }
 
 sub encode_chunked {
-	my($data, $size) = @_;
-	$size = 128 unless ($size);
-	my $chunked = "";
-	
-	my $n = 0;
-	my $bytes = length($data);
-	while ($bytes >= $size) {
-		$chunked .= sprintf "%x\x0d\x0a%s\x0d\x0a", $size, substr($data, $n, $size);
-		$n += $size;
-		$bytes -= $size;
-	}
-	if ($bytes) {
-		$chunked .= sprintf "%x\x0d\x0a%s\x0d\x0a", $bytes, substr($data, $n, $bytes);
-	}
-	$chunked .= "0\x0d\x0a\x0d\x0a"
+    my($data, $size) = @_;
+    $size = 128 unless ($size);
+    my $chunked = "";
+  
+    my $n = 0;
+    my $bytes = length($data);
+    while ($bytes >= $size) {
+        $chunked .= sprintf "%x\x0d\x0a%s\x0d\x0a", $size, substr($data, $n, $size);
+        $n += $size;
+        $bytes -= $size;
+    }
+    if ($bytes) {
+        $chunked .= sprintf "%x\x0d\x0a%s\x0d\x0a", $bytes, substr($data, $n, $bytes);
+    }
+    $chunked .= "0\x0d\x0a\x0d\x0a"
 }
diff --git a/apache2/t/run-unit-tests.pl.in b/apache2/t/run-unit-tests.pl.in
index 845061fc..66212c1c 100755
--- a/apache2/t/run-unit-tests.pl.in
+++ b/apache2/t/run-unit-tests.pl.in
@@ -4,8 +4,8 @@
 #
 # Syntax:
 #          All: run-tests.pl
-#	 All in file: run-tests.pl file
-#	 Nth in file: run-tests.pl file N
+#     All in file: run-tests.pl file
+#     Nth in file: run-tests.pl file N
 #
 use strict;
 use POSIX qw(WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG);
@@ -22,140 +22,140 @@ my $TOTAL = 0;
 my $DEBUG = $ENV{MSC_TEST_DEBUG} || 0;
 
 if (defined $ARGV[0]) {
-	runfile(dirname($ARGV[0]), basename($ARGV[0]), $ARGV[1]);
-	done();
+    runfile(dirname($ARGV[0]), basename($ARGV[0]), $ARGV[1]);
+    done();
 }
 
 for my $type (sort @TYPES) {
-	my $dir = "$SCRIPTDIR/$type";
-	my @cfg = ();
+    my $dir = "$SCRIPTDIR/$type";
+    my @cfg = ();
 
-	# Get test names
-	opendir(DIR, "$dir") or quit(1, "Failed to open \"$dir\": $!");
-	@cfg = grep { /\.t$/ && -f "$dir/$_" } readdir(DIR);
-	closedir(DIR);
+    # Get test names
+    opendir(DIR, "$dir") or quit(1, "Failed to open \"$dir\": $!");
+    @cfg = grep { /\.t$/ && -f "$dir/$_" } readdir(DIR);
+    closedir(DIR);
 
-	for my $cfg (sort @cfg) {
-		runfile($dir, $cfg);
-	}
+    for my $cfg (sort @cfg) {
+        runfile($dir, $cfg);
+    }
 
 }
 done();
 
 
 sub runfile {
-	my($dir, $cfg, $testnum) = @_;
-	my $fn = "$dir/$cfg";
-	my @data = ();
-	my $edata;
-	my @C = ();
-	my @test = ();
-	my $teststr;
-	my $n = 0;
-	my $pass = 0;
+    my($dir, $cfg, $testnum) = @_;
+    my $fn = "$dir/$cfg";
+    my @data = ();
+    my $edata;
+    my @C = ();
+    my @test = ();
+    my $teststr;
+    my $n = 0;
+    my $pass = 0;
 
-	open(CFG, "<$fn") or quit(1, "Failed to open \"$fn\": $!");
-	@data = <CFG>;
-	
-	$edata = q/@C = (/ . join("", @data) . q/)/;
-	eval $edata;
-	quit(1, "Failed to read test data \"$cfg\": $@") if ($@);
+    open(CFG, "<$fn") or quit(1, "Failed to open \"$fn\": $!");
+    @data = <CFG>;
+    
+    $edata = q/@C = (/ . join("", @data) . q/)/;
+    eval $edata;
+    quit(1, "Failed to read test data \"$cfg\": $@") if ($@);
 
-	unless (@C) {
-		msg("\nNo tests defined for $fn");
-		return;
-	}
+    unless (@C) {
+        msg("\nNo tests defined for $fn");
+        return;
+    }
 
-	msg("\nLoaded ".@C." tests from $fn");
-	for my $t (@C) {
-		$n++;
-		next if (defined $testnum and $n != $testnum);
+    msg("\nLoaded ".@C." tests from $fn");
+    for my $t (@C) {
+        $n++;
+        next if (defined $testnum and $n != $testnum);
 
-		my %t = %{$t || {}};
-		my $id = sprintf("%6d", $n);
-		my $in = (exists($t{input}) and defined($t{input})) ? $t{input} : "";
-		my $out;
-		my $test_in = new FileHandle();
-		my $test_out = new FileHandle();
-		my $test_pid;
-		my $rc = 0;
-		my $param;
+        my %t = %{$t || {}};
+        my $id = sprintf("%6d", $n);
+        my $in = (exists($t{input}) and defined($t{input})) ? $t{input} : "";
+        my $out;
+        my $test_in = new FileHandle();
+        my $test_out = new FileHandle();
+        my $test_pid;
+        my $rc = 0;
+        my $param;
 
-		if ($t{type} eq "tfn") {
-			$param = escape($t{output});
-		}
-		elsif ($t{type} eq "op") {
-			$param = escape($t{param});
-		}
-		elsif ($t{type} eq "action") {
-			$param = escape($t{param});
-		}
-		else {
-			quit(1, "Unknown type \"$t{type}\" - should be one of: " . join(",",@TYPES));
-		}
+        if ($t{type} eq "tfn") {
+            $param = escape($t{output});
+        }
+        elsif ($t{type} eq "op") {
+            $param = escape($t{param});
+        }
+        elsif ($t{type} eq "action") {
+            $param = escape($t{param});
+        }
+        else {
+            quit(1, "Unknown type \"$t{type}\" - should be one of: " . join(",",@TYPES));
+        }
 
-		@test = ("-t", $t{type}, "-n", $t{name}, "-p", $param, "-D", "$DEBUG", (exists($t{ret}) ? ("-r", $t{ret}) : ()), (exists($t{iterations}) ? ("-I", $t{iterations}) : ()), (exists($t{prerun}) ? ("-P", $t{prerun}) : ()));
-		$teststr = "$TEST " . join(" ", map { "\"$_\"" } @test);
-		$test_pid = open2($test_out, $test_in, $TEST, @test) or quit(1, "Failed to execute test: $teststr\": $!");
-		print $test_in "$in";
-		close $test_in;
-		$out = join("\\n", split(/\n/, <$test_out>));
-		close $test_out;
-		waitpid($test_pid, 0);
+        @test = ("-t", $t{type}, "-n", $t{name}, "-p", $param, "-D", "$DEBUG", (exists($t{ret}) ? ("-r", $t{ret}) : ()), (exists($t{iterations}) ? ("-I", $t{iterations}) : ()), (exists($t{prerun}) ? ("-P", $t{prerun}) : ()));
+        $teststr = "$TEST " . join(" ", map { "\"$_\"" } @test);
+        $test_pid = open2($test_out, $test_in, $TEST, @test) or quit(1, "Failed to execute test: $teststr\": $!");
+        print $test_in "$in";
+        close $test_in;
+        $out = join("\\n", split(/\n/, <$test_out>));
+        close $test_out;
+        waitpid($test_pid, 0);
 
-		$rc = $?;
-		if ( WIFEXITED($rc) ) {
-			$rc = WEXITSTATUS($rc);
-		}
-		elsif( WIFSIGNALED($rc) ) {
-			msg("Test exited with signal " . WTERMSIG($rc) . ".");
-			msg("Executed: $teststr");
-			$rc = -1;
-		}
-		else {
-			msg("Test exited with unknown error.");
-			$rc = -1;
-		}
+        $rc = $?;
+        if ( WIFEXITED($rc) ) {
+            $rc = WEXITSTATUS($rc);
+        }
+        elsif( WIFSIGNALED($rc) ) {
+            msg("Test exited with signal " . WTERMSIG($rc) . ".");
+            msg("Executed: $teststr");
+            $rc = -1;
+        }
+        else {
+            msg("Test exited with unknown error.");
+            $rc = -1;
+        }
 
-		if ($rc == 0) {
-			$pass++;
-		}
+        if ($rc == 0) {
+            $pass++;
+        }
 
-		msg(sprintf("%s) %s \"%s\"%s: %s%s", $id, $t{type}, $t{name}, (exists($t{comment}) ? " $t{comment}" : ""), ($rc ? "failed" : "passed"), ((defined($out) && $out ne "")? " ($out)" : "")));
-		
-	}
+        msg(sprintf("%s) %s \"%s\"%s: %s%s", $id, $t{type}, $t{name}, (exists($t{comment}) ? " $t{comment}" : ""), ($rc ? "failed" : "passed"), ((defined($out) && $out ne "")? " ($out)" : "")));
+        
+    }
 
-	$TOTAL += $testnum ? 1 : $n;
-	$PASSED += $pass;
+    $TOTAL += $testnum ? 1 : $n;
+    $PASSED += $pass;
 
-	msg(sprintf("Passed: %2d; Failed: %2d", $pass, $testnum ? (1 - $pass) : ($n - $pass)));
+    msg(sprintf("Passed: %2d; Failed: %2d", $pass, $testnum ? (1 - $pass) : ($n - $pass)));
 }
 
 sub escape {
-	my @new = ();
-	for my $c (split(//, $_[0])) {
-		push @new, ((ord($c) >= 0x20 and ord($c) <= 0x7e) ? $c : sprintf("\\x%02x", ord($c)));
-	}
-	join('', @new);
+    my @new = ();
+    for my $c (split(//, $_[0])) {
+        push @new, ((ord($c) >= 0x20 and ord($c) <= 0x7e) ? $c : sprintf("\\x%02x", ord($c)));
+    }
+    join('', @new);
 }
 
 sub msg {
-	print STDOUT "@_\n" if (@_);
+    print STDOUT "@_\n" if (@_);
 }
 
 sub quit {
-	my($ec,$msg) = @_;
-	$ec = 0 unless (defined $_[0]);
+    my($ec,$msg) = @_;
+    $ec = 0 unless (defined $_[0]);
 
-	msg("$msg") if (defined $msg);
+    msg("$msg") if (defined $msg);
 
-	exit $ec;
+    exit $ec;
 }
 
 sub done {
-	if ($PASSED != $TOTAL) {
-		quit(1, "\n$PASSED/$TOTAL tests passed.");
-	}
+    if ($PASSED != $TOTAL) {
+        quit(1, "\n$PASSED/$TOTAL tests passed.");
+    }
 
-	quit(0, "\nAll tests passed ($TOTAL).");
+    quit(0, "\nAll tests passed ($TOTAL).");
 }
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index e9f510d2..6d2d9293 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -6,7 +6,7 @@
   Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.6.0-trunk (Aug 24, 2009)</releaseinfo>
+    <releaseinfo>Version 2.6.0-trunk (Sep 18, 2009)</releaseinfo>
 
     <copyright>
       <year>2004-2009</year>