From: John Napiorkowski Date: Mon, 9 May 2011 20:39:16 +0000 (-0400) Subject: removed backcompat code for old PSGI Engine since this would be handled somewhere... X-Git-Tag: 5.89003~42 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d82b4dae25a2acf8e6b0f02a111a59d1d11c93f7 removed backcompat code for old PSGI Engine since this would be handled somewhere else better --- diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 77844da..03b0765 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -2410,27 +2410,7 @@ Starts the engine. =cut -sub run { - my $c = shift; - $c->engine_loader->needs_psgi_engine_compat_hack ? - $c->_run_needs_psgi_engine_compat_hack(@_) : - $c->engine->run( $c, $c->_finalized_psgi_app, @_ ); -} - -sub _run_needs_psgi_engine_compat_hack { - my $c = shift; - - ## We assume if they used the classic PSGI Engine, they must has CC:M - for my $metal (Catalyst::Controller::Metal->metals_for($c)) { - my $res = $metal->call(@_); - if (defined $res && !(ref $res eq 'ARRAY' && $res->[0] == 404)) { - return $res; - } - } - - ## If we got this far, just do the psgi app - $c->_finalized_psgi_app->(@_) -} +sub run { my $c = shift; return $c->engine->run( $c, $c->_finalized_psgi_app, @_ ) } =head2 $c->set_action( $action, $code, $namespace, $attrs )