X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=b0f04a3ab571dd63aacbca08eca7680a932d88d0;hp=2399ae514e8bc1e4284215b246b04901f8fd957c;hb=75a7c429032fcfea6805a0cfedcedabb656e9931;hpb=88e5a8b0c4d28e46b8ba6b6b9567063e57af9063

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index 2399ae5..b0f04a3 100644
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -196,6 +196,8 @@ sub from_psgi_response {
         die "You can't set a Catalyst response from that, expect a valid PSGI response";
     }
 
+    return unless $self->_context->has_encoding;
+
     # Encoding compatibilty.   If the response set a charset, well... we need
     # to assume its properly encoded and NOT encode for this response.  Otherwise
     # We risk double encoding.