Fix Apache, added C::E::Apache::MP1 and C::E::Apache::MP2, added $c->finialize_cookies

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 90d158a..e7cf1d5 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -144,11 +144,19 @@ sub import {
         $caller->log->debug('Debug messages enabled');
     }
 
-    # Options
-    my $engine =
-      $ENV{MOD_PERL}
-      ? 'Catalyst::Engine::Apache'
-      : 'Catalyst::Engine::CGI';
+    my $engine ='Catalyst::Engine::CGI';
+
+    if ( $ENV{MOD_PERL} ) {
+
+        require mod_perl;
+
+        if ( $mod_perl::VERSION >= 1.99 ) {
+            $engine ='Catalyst::Engine::Apache::MP2';
+        }
+        else {
+            $engine ='Catalyst::Engine::Apache::MP1';
+        }
+    }
 
     my @plugins;
     foreach (@options) {