don't override status or content_length

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine.pm

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index b469d70..750f3fe 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -161,23 +161,23 @@ sub finalize {
 
     $c->finalize_cookies;
 
-    if ( my $location = $c->res->redirect ) {
+    if ( my $location = $c->response->redirect ) {
         $c->log->debug(qq/Redirecting to "$location"/) if $c->debug;
         $c->response->header( Location => $location );
-        $c->response->status(302);
+        $c->response->status(302) if $c->response->status !~ /3\d\d$/;
     }
 
     if ( $#{ $c->error } >= 0 ) {
         $c->finalize_error;
     }
 
-    if ( !$c->res->output && $c->res->status !~ /^(1\d\d|[23]04)$/ ) {
+    if ( !$c->response->output && $c->response->status !~ /^(1|3)\d\d$/ ) {
         $c->finalize_error;
     }
 
-    if ( $c->res->output ) {
+    if ( $c->response->output && !$c->response->content_length ) {
         use bytes; # play safe with a utf8 aware perl
-        $c->response->content_length( length $c->res->output );
+        $c->response->content_length( length $c->response->output );
     }
 
     my $status = $c->finalize_headers;