X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=c4148963c5d2b739c1bc41a50fb39da3361c2f42;hp=181c5b024cf8cf24b97e43c56473eb7a81aa43f6;hb=89ba65d5fb85ab30fa5d8109cd0d22860608605b;hpb=d26d64c66308b65cb6c007f935a5a048135b10a5

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 181c5b0..c414896 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -181,7 +181,6 @@ sub finalize_error {
         $name  = "<h1>$name</h1>";
 
         # Don't show context in the dump
-        $c->req->_clear_context;
         $c->res->_clear_context;
 
         # Don't show body parser in the dump
@@ -332,7 +331,7 @@ Allows engines to write headers to response
 sub finalize_headers {
     my ($self, $ctx) = @_;
 
-    $ctx->response->finalize_headers;
+    $ctx->finalize_headers unless $ctx->response->finalized_headers;
     return;
 }
 
@@ -535,7 +534,7 @@ sub prepare_read {
 
 =head2 $self->prepare_request(@arguments)
 
-Sets up the PSGI environment in the Engine (just for back compat).
+Populate the context object from the request object.
 
 =cut
 
@@ -682,6 +681,7 @@ sub build_psgi_app {
 
         return sub {
             my ($respond) = @_;
+            confess("Did not get a response callback for writer, cannot continiue") unless $respond;
             $app->handle_request(env => $env, response_cb => $respond);
         };
     };