X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=83866391e252e6063a6b31bda31ffd42d308204e;hb=e5cd6cc061d87d09a29fe67c7c3ab8fc386a5af0;hp=181c5b024cf8cf24b97e43c56473eb7a81aa43f6;hpb=d26d64c66308b65cb6c007f935a5a048135b10a5;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 181c5b0..8386639 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)
@@ -535,7 +537,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 +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);
};
};
@@ -729,4 +732,6 @@ the same terms as Perl itself.
=cut
+__PACKAGE__->meta->make_immutable;
+
1;