X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=73c97ef0912d5748a64219acf7574a5c2dca66fc;hp=a3aa91dc77676257f828755783b103f00f6e334f;hb=05f2584c0bb421a582148f1c511495bfd238a3de;hpb=96c9f5d4c9cebf815970a5ea94b90ad693ebaa93

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a3aa91d..73c97ef 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -99,7 +99,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.90014';
+our $VERSION = '5.90015';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -1636,7 +1636,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' ) {
@@ -1746,7 +1746,7 @@ EOF
 
     $c->finalize_cookies;
 
-    $c->engine->finalize_headers( $c, @_ );
+    $c->response->finalize_headers();
 
     # Done
     $response->finalized_headers(1);