X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=3ad1701a2cb0a938e9ed9dddbc6e2a88cd144b72;hb=1085c936f6ea024206a1aee192a87c4c9fc79087;hp=dcc8c2b5bc176c72b5d9eabdd63cc3cc5ec395a3;hpb=00fa37d0e9385f660b2e013ac41e00d3f13a8122;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index dcc8c2b..3ad1701 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -36,6 +36,7 @@ use Carp qw/croak carp shortmess/;
 use Try::Tiny;
 use Plack::Middleware::Conditional;
 use Plack::Middleware::ReverseProxy;
+use Plack::Middleware::IIS6ScriptNameFix;
 
 BEGIN { require 5.008004; }
 
@@ -2599,9 +2600,18 @@ sub engine_class {
 }
 
 sub setup_engine {
-    my ($class) = @_;
-
-    $class->engine_loader(Catalyst::EngineLoader->new(application_name => $class));
+    my ($class, $compat_requested_engine) = @_;
+
+    $class->engine_loader(
+        Catalyst::EngineLoader->new({
+            application_name => $class,
+            (!defined $compat_requested_engine
+                 ? ()
+                 : (compat_options => {
+                     requested_engine => $compat_requested_engine,
+                 })),
+        }),
+    );
 
     my $engine = $class->engine_class;
     Class::MOP::load_class($engine);
@@ -2635,13 +2645,27 @@ sub _finalized_psgi_app {
 sub _setup_psgi_app {
     my ($app) = @_;
 
-    if (my $home = Path::Class::Dir->new($app->config->{home})) {
+    for my $home (Path::Class::Dir->new($app->config->{home})) {
         my $psgi_file = $home->file(
             Catalyst::Utils::appprefix($app) . '.psgi',
         );
 
-        return Plack::Util::load_psgi($psgi_file)
-            if -e $psgi_file;
+        next unless -e $psgi_file;
+        my $psgi_app = Plack::Util::load_psgi($psgi_file);
+
+        return $psgi_app
+            unless $app->engine_loader->needs_psgi_engine_compat_hack;
+
+        # load_psgi ran a .psgi file doing ->setup_engine('PSGI'). That's what
+        # .psgi files generated by the old Engine::PSGI do. Those return an app
+        # coderef calling into MyApp->run, which doesn't work anymore, so we're
+        # just ignoring it and use the wrapped legacy psgi app
+        warn <<"EOW";
+Found a legacy Catalyst::Engine::PSGI .psgi file at ${psgi_file}.
+
+Its content has been ignored. Please consult the Catalyst::Upgrading
+documentation on how to upgrade from Catalyst::Engine::PSGI.
+EOW
     }
 
     return $app->_wrapped_legacy_psgi_app($app->psgi_app);
@@ -2709,32 +2733,10 @@ sub _wrapped_legacy_psgi_app {
         },
     );
 
-    $psgi_app = Plack::Middleware::Conditional->wrap(
-        $psgi_app,
-        condition => $server_matches->(qr/IIS\/[6-9]\.[0-9]/),
-        builder   => sub {
-            my ($to_wrap) = @_;
-            return sub {
-                my ($env) = @_;
-
-                my @script_name = split(m!/!, $env->{PATH_INFO});
-                my @path_translated = split(m!/|\\\\?!, $env->{PATH_TRANSLATED});
-                my @path_info;
-
-                while ($script_name[$#script_name] eq $path_translated[$#path_translated]) {
-                    pop(@path_translated);
-                    unshift(@path_info, pop(@script_name));
-                }
-
-                unshift(@path_info, '', '');
-
-                $env->{PATH_INFO} = join('/', @path_info);
-                $env->{SCRIPT_NAME} = join('/', @script_name);
-
-                return $to_wrap->($env);
-            };
-        },
-    );
+    # we're applying this unconditionally as the middleware itself already makes
+    # sure it doesn't fuck things up if it's not running under one of the right
+    # IIS versions
+    $psgi_app = Plack::Middleware::IIS6ScriptNameFix->wrap($psgi_app);
 
     return $psgi_app;
 }