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=a66847a360af43bea7b414a0a258f97a17f7a482;hb=89ba65d5fb85ab30fa5d8109cd0d22860608605b;hpb=767480fd8b4151e350831a52dbc9c6265bf84485
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index a66847a..c414896 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -181,7 +181,6 @@ sub finalize_error {
$name = "
$name
";
# 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;
}
@@ -522,7 +521,7 @@ sub prepare_query_parameters {
=head2 $self->prepare_read($c)
-prepare to read from the engine.
+Prepare to read by initializing the Content-Length from headers.
=cut
@@ -670,8 +669,7 @@ sub run {
=head2 build_psgi_app ($app, @args)
-Builds and returns a PSGI application closure, wrapping it in the reverse proxy
-middleware if the using_frontend_proxy config setting is set.
+Builds and returns a PSGI application closure. (Raw, not wrapped in middleware)
=cut
@@ -683,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);
};
};