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=2a5f5f7b9ad1615c1558f702f665649b145c054e;hp=17ec97bd64e441408313cb0c9615348836609fe0;hb=aee7cdcc0b2b3b7dc672b4b4a31b8c3b7ef3f1f7;hpb=661de07237c4320b80ff703d5838722019a8019d diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 17ec97b..2a5f5f7 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -12,13 +12,25 @@ use HTTP::Headers; use URI::QueryParam; use Moose::Util::TypeConstraints; use Plack::Loader; -use Plack::Middleware::Conditional; -use Plack::Middleware::ReverseProxy; +use Catalyst::EngineLoader; +use Encode (); +use utf8; use namespace::clean -except => 'meta'; has env => (is => 'ro', writer => '_set_env', clearer => '_clear_env'); +my $WARN_ABOUT_ENV = 0; +around env => sub { + my ($orig, $self, @args) = @_; + if(@args) { + warn "env as a writer is deprecated, you probably need to upgrade Catalyst::Engine::PSGI" + unless $WARN_ABOUT_ENV++; + return $self->_set_env(@args); + } + return $self->$orig; +}; + # input position and length has read_length => (is => 'rw'); has read_position => (is => 'rw'); @@ -30,11 +42,15 @@ has _response_cb => ( isa => 'CodeRef', writer => '_set_response_cb', clearer => '_clear_response_cb', + predicate => '_has_response_cb', ); +subtype 'Catalyst::Engine::Types::Writer', + as duck_type([qw(write close)]); + has _writer => ( is => 'ro', - isa => duck_type([qw(write close)]), + isa => 'Catalyst::Engine::Types::Writer', writer => '_set_writer', clearer => '_clear_writer', ); @@ -115,6 +131,11 @@ sub finalize_cookies { -httponly => $val->{httponly} || 0, ) ); + if (!defined $cookie) { + $c->log->warn("undef passed in '$name' cookie value - not setting cookie") + if $c->debug; + next; + } push @cookies, $cookie->as_string; } @@ -155,6 +176,14 @@ sub finalize_error { $c->res->content_type('text/html; charset=utf-8'); my $name = ref($c)->config->{name} || join(' ', split('::', ref $c)); + + # Prevent Catalyst::Plugin::Unicode::Encoding from running. + # This is a little nasty, but it's the best way to be clean whether or + # not the user has an encoding plugin. + + if ($c->can('encoding')) { + $c->{encoding} = ''; + } my ( $title, $error, $infos ); if ( $c->debug ) { @@ -303,11 +332,12 @@ sub finalize_error { - # 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 ); + $c->res->{body} = Encode::encode("UTF-8", $c->res->{body}); + # Return 500 $c->res->status(500); } @@ -321,6 +351,15 @@ Abstract method, allows engines to write headers to response sub finalize_headers { my ($self, $ctx) = @_; + # This is a less-than-pretty hack to avoid breaking the old + # Catalyst::Engine::PSGI. 5.9 Catalyst::Engine sets a response_cb and + # expects us to pass headers to it here, whereas Catalyst::Enngine::PSGI + # just pulls the headers out of $ctx->response in its run method and never + # sets response_cb. So take the lack of a response_cb as a sign that we + # don't need to set the headers. + + return unless $self->_has_response_cb; + my @headers; $ctx->response->headers->scan(sub { push @headers, @_ }); @@ -525,7 +564,12 @@ sub prepare_path { # set the request URI my $path; if (!$ctx->config->{use_request_uri_for_path}) { - $path = $base_path . $env->{PATH_INFO}; + my $path_info = $env->{PATH_INFO}; + if ( exists $env->{REDIRECT_URL} ) { + $base_path = $env->{REDIRECT_URL}; + $base_path =~ s/\Q$path_info\E$//; + } + $path = $base_path . $path_info; $path =~ s{^/+}{}; $path =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go; $path =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE @@ -759,19 +803,38 @@ The amount of input data that has already been read. =head2 $self->run($app, $server) Start the engine. Builds a PSGI application and calls the -run method on the server passed in.. +run method on the server passed in, which then causes the +engine to loop, handling requests.. =cut sub run { - my ($self, $app, @args) = @_; - my $server = pop @args if blessed $args[-1]; - $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 - my $psgi = $self->build_psgi_app($app, @args); - $server->run($psgi); + my ($self, $app, $psgi, @args) = @_; + # @args left here rather than just a $options, $server for back compat with the + # old style scripts which send a few args, then a hashref + + # They should never actually be used in the normal case as the Plack engine is + # passed in got all the 'standard' args via the loader in the script already. + + # FIXME - we should stash the options in an attribute so that custom args + # like Gitalist's --git_dir are possible to get from the app without stupid tricks. + my $server = pop @args if (scalar @args && blessed $args[-1]); + my $options = pop @args if (scalar @args && ref($args[-1]) eq 'HASH'); + # Back compat hack for applications with old (non Catalyst::Script) scripts to work in FCGI. + if (scalar @args && !ref($args[0])) { + if (my $listen = shift @args) { + $options->{listen} ||= [$listen]; + } + } + if (! $server ) { + $server = Catalyst::EngineLoader->new(application_name => ref($self))->auto(%$options); + # We're not being called from a script, so auto detect what backend to + # run on. This should never happen, as mod_perl never calls ->run, + # instead the $app->handle method is called per request. + $app->log->warn("Not supplied a Plack engine, falling back to engine auto-loader (are your scripts ancient?)") + } + $app->run_options($options); + $server->run($psgi, $options); } =head2 build_psgi_app ($app, @args) @@ -784,7 +847,7 @@ middleware if the using_frontend_proxy config setting is set. sub build_psgi_app { my ($self, $app, @args) = @_; - my $psgi_app = sub { + return sub { my ($env) = @_; return sub { @@ -793,18 +856,6 @@ sub build_psgi_app { $app->handle_request(env => $env); }; }; - - $psgi_app = Plack::Middleware::Conditional->wrap( - $psgi_app, - condition => sub { - my ($env) = @_; - return if $app->config->{ignore_frontend_proxy}; - return $env->{REMOTE_ADDR} eq '127.0.0.1' || $app->config->{using_frontend_proxy}; - }, - builder => sub { Plack::Middleware::ReverseProxy->wrap($_[0]) }, - ); - - return $psgi_app; } =head2 $self->write($c, $buffer) @@ -821,7 +872,7 @@ sub write { $self->_prepared_write(1); } - return 0 if !defined $buffer; + $buffer = q[] unless defined $buffer; my $len = length($buffer); $self->_writer->write($buffer); @@ -858,7 +909,7 @@ not directly available via Catalyst objects $c->request, $c->engine ... BEWARE: If you really need to access some environment variable from your Catalyst application you should use $c->engine->env->{VARNAME} instead of $ENV{VARNAME}, -as in some enviroments the %ENV hash does not contain what you would expect. +as in some environments the %ENV hash does not contain what you would expect. =head1 AUTHORS