X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=0152ebf61f65ee16ab47a4873fb66d4531ba5bc9;hb=29bb04adc1fd0050a029b50aec57264aad24c1d5;hp=62dc3bcf3c8894869d40ff00f0b4b7e3de9e818d;hpb=c821df216d6d7e7e0386516e43c0c09fd4a295e7;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 62dc3bc..0152ebf 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -304,7 +304,8 @@ sub finalize_error { - # Trick IE + # Trick IE. Old versions of IE would display their own error page instead + # of ours if we'd give it less than 512 bytes. $c->res->{body} .= ( ' ' x 512 ); # Return 500 @@ -743,19 +744,30 @@ header. The amount of input data that has already been read. -=head2 $self->run($c) +=head2 $self->run($app, $server) -Start the engine. Implemented by the various engine classes. +Start the engine. Builds a PSGI application and calls the +run method on the server passed in.. =cut sub run { my ($self, $app, $server, @args) = @_; + $server ||= Plack::Loader->auto(); # We're not being called from a script, + # so auto detect what backend to run on. + # This does *NOT* cover mod_perl. # FIXME - Do something sensible with the options we're passed - $server->run($self->_build_psgi_app($app, @args)); + $server->run($self->build_psgi_app($app, @args)); } -sub _build_psgi_app { +=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. + +=cut + +sub build_psgi_app { my ($self, $app, @args) = @_; my $psgi_app = sub {