X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=0e15f5b67f2255b0e520d43c8e009c5b4db22314;hp=77bd1c5ae3e853288b565142f8ca4979aa78eed7;hb=89ba65d5fb85ab30fa5d8109cd0d22860608605b;hpb=f444811bb1a174c842e80bf5b9a4c24dc1a85ee0

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 77bd1c5..0e15f5b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1788,7 +1788,7 @@ sub finalize {
             $c->finalize_error;
         }
 
-        $c->finalize_headers;
+        $c->finalize_headers unless $c->response->finalized_headers;
 
         # HEAD request
         if ( $c->request->method eq 'HEAD' ) {
@@ -1898,7 +1898,7 @@ EOF
 
     $c->finalize_cookies;
 
-    $c->engine->finalize_headers( $c, @_ );
+    $c->response->finalize_headers();
 
     # Done
     $response->finalized_headers(1);