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=65ef3fe82039088acea1e31f9eeb8eae8d88f68e;hp=a6a6f25855976c36d7ab5838f840cf8f620403fc;hb=11e7af55dda3f3acd9ab3b484b54180f76b253df;hpb=c4a175162702fe2a2c7fa4ff2ad31219a6cf44d4
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index a6a6f25..65ef3fe 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;
}
@@ -395,14 +394,17 @@ sub prepare_body_parameters {
=head2 $self->prepare_parameters($c)
-sets up parameters from query and post parameters.
+Sets up parameters from query and post parameters.
+If parameters have already been set up will clear
+existing parameters and set up again.
=cut
sub prepare_parameters {
my ( $self, $c ) = @_;
- $c->request->parameters;
+ $c->request->_clear_parameters;
+ return $c->request->parameters;
}
=head2 $self->prepare_path($c)
@@ -682,6 +684,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);
};
};