X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=2367139764d3430572bbc79c727bc2091566ba0e;hb=1cc1daddba7f95b39511329606761cd2ba7c4ed6;hp=a66847a360af43bea7b414a0a258f97a17f7a482;hpb=767480fd8b4151e350831a52dbc9c6265bf84485;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index a66847a..2367139 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)
@@ -522,7 +524,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
@@ -541,6 +543,7 @@ Populate the context object from the request object.
sub prepare_request {
my ($self, $ctx, %args) = @_;
+ $ctx->log->psgienv($args{env}) if $ctx->log->can('psgienv');
$ctx->request->_set_env($args{env});
$self->_set_env($args{env}); # Nasty back compat!
$ctx->response->_set_response_cb($args{response_cb});
@@ -670,8 +673,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 +685,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);
};
};
@@ -730,4 +733,6 @@ the same terms as Perl itself.
=cut
+__PACKAGE__->meta->make_immutable;
+
1;