diff --git a/apache2/t/regression/misc/00-multipart-parser.t b/apache2/t/regression/misc/00-multipart-parser.t index 391813f9..4efc0551 100644 --- a/apache2/t/regression/misc/00-multipart-parser.t +++ b/apache2/t/regression/misc/00-multipart-parser.t @@ -124,7 +124,10 @@ }, { type => "misc", - comment => "multipart parser (boundary contains \"BoUnDaRy\")", + comment => "multipart parser (boundary contains \"bOuNdArY\")", + note => q( + KHTML Boundary + ), conf => qq( SecRuleEngine On SecDebugLog $ENV{DEBUG_LOG} @@ -145,19 +148,19 @@ request => new HTTP::Request( POST => "http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt", [ - "Content-Type" => "multipart/form-data; boundary=------------------------------------------------BoUnDaRy", + "Content-Type" => "multipart/form-data; boundary=--------0xKhTmLbOuNdArY", ], normalize_raw_request_data( q( - --------------------------------------------------BoUnDaRy + ----------0xKhTmLbOuNdArY Content-Disposition: form-data; name="a" 1 - --------------------------------------------------BoUnDaRy + ----------0xKhTmLbOuNdArY Content-Disposition: form-data; name="b" 2 - --------------------------------------------------BoUnDaRy-- + ----------0xKhTmLbOuNdArY-- ), ), ), diff --git a/apache2/t/run-regression-tests.pl.in b/apache2/t/run-regression-tests.pl.in index a21e265f..e99bb82b 100755 --- a/apache2/t/run-regression-tests.pl.in +++ b/apache2/t/run-regression-tests.pl.in @@ -351,6 +351,7 @@ sub do_raw_request { # Join togeather the request my $r = join("", @_); + dbg($r); # Write to socket print $sock "$r"; @@ -374,7 +375,11 @@ sub do_request { if (ref $r eq "HTTP::Request") { # dbg("REQUEST: ", $r); - return $UA->request($r); + my $resp = $UA->request($r); + if ($opt{d}) { + dbg($resp->request()->as_string()); + } + return $resp } else { # dbg("REQUEST:\n", $r); @@ -456,7 +461,7 @@ sub dbg { my $out = join "", map { (ref $_ ne "" ? Dumper($_) : $_) } @_; - $out =~ s/^/DBG: /m; + $out =~ s/^/DBG: /mg; print STDOUT "$out\n"; }