X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngineLoader.pm;h=22b6ff06460bc81fc3d9af5d61463b2aee09f05a;hb=f7a3f8fd0a1df1dc3f5811747cfa377a020b9dcc;hp=818b9f0228de0cd67a59418b30a39b0f91898594;hpb=86c4012a832d62f49efd30e6637289332e749c1e;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/EngineLoader.pm b/lib/Catalyst/EngineLoader.pm
index 818b9f0..22b6ff0 100644
--- a/lib/Catalyst/EngineLoader.pm
+++ b/lib/Catalyst/EngineLoader.pm
@@ -82,10 +82,12 @@ around guess => sub {
     my $old_engine = Catalyst::Utils::env_value($self->application_name, 'ENGINE');
     if (!defined $old_engine) { # Not overridden
     }
-    elsif ($old_engine =~ /^(PSGI|CGI|FastCGI|HTTP|Apache.*)$/) {
->>>>>>> Fix bug stopping fastcgi script working
+    elsif ($old_engine =~ /^(PSGI|CGI|HTTP|Apache.*)$/) {
         # Trust autodetect
     }
+    elsif ($old_engine eq 'FastCGI') {
+        $engine = 'FCGI';
+    }
     elsif ($old_engine eq "HTTP::Prefork") { # Too bad if you're customising, we don't handle options
                                              # write yourself a script to collect and pass in the options
         $engine = "Starman";