In Catalyst::Test, don't mangle headers of non-HTML responses. RT#79043

diff --git a/Changes b/Changes
index b78e910..9f23ad3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -123,6 +123,8 @@
     issue with new versions of Module::Runtime (0.012) on perl 5.10
     which stopped Catalyst::Controller from compiling.
 
+  - In Catalyst::Test, don't mangle headers of non-HTML responses. RT#79043
+
 5.90008 - TRIAL 2012-02-06 20:49:00
 
  New features and refactoring:

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index fbc8ada..53c16a2 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -305,16 +305,18 @@ sub _local_request {
             # getting it into Plack::Test, or make a middleware out of it, or
             # whatever. Seriously - horrible.
 
-            require HTML::HeadParser;
+            if (!$resp->content_type || $resp->content_is_html) {
+                require HTML::HeadParser;
 
-            my $parser = HTML::HeadParser->new();
-            $parser->xml_mode(1) if $resp->content_is_xhtml;
-            $parser->utf8_mode(1) if $] >= 5.008 && $HTML::Parser::VERSION >= 3.40;
+                my $parser = HTML::HeadParser->new();
+                $parser->xml_mode(1) if $resp->content_is_xhtml;
+                $parser->utf8_mode(1) if $] >= 5.008 && $HTML::Parser::VERSION >= 3.40;
 
-            $parser->parse( $resp->content );
-            my $h = $parser->header;
-            for my $f ( $h->header_field_names ) {
-                $resp->init_header( $f, [ $h->header($f) ] );
+                $parser->parse( $resp->content );
+                my $h = $parser->header;
+                for my $f ( $h->header_field_names ) {
+                    $resp->init_header( $f, [ $h->header($f) ] );
+                }
             }
             # Another horrible hack to make the response headers have a
             # 'status' field. This is for back-compat, but you should