drop version.pm and minor refactor of injected handler

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 1b3dfaf..73c63fb 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2594,12 +2594,13 @@ sub setup_engine {
     }
 
     if ($ENV{MOD_PERL}) {
+        use Catalyst::Engine::Loader;
+        my $apache = Catalyst::Engine::Loader->auto;
         # FIXME - Immutable
         $class->meta->add_method(handler => sub {
             my $r = shift;
             my $app = $class->psgi_app;
-            use Plack::Handler::Apache2;
-            Plack::Handler::Apache2->call_app($r, $app);
+            $apache->call_app($r, $app);
         });
     }
 

diff --git a/lib/Catalyst/Engine/Loader.pm b/lib/Catalyst/Engine/Loader.pm
index 5de0acc..026a07c 100644 (file)
--- a/lib/Catalyst/Engine/Loader.pm
+++ b/lib/Catalyst/Engine/Loader.pm
@@ -11,9 +11,10 @@ around guess => sub {
     if ($engine eq 'Standalone') {
         if ( $ENV{MOD_PERL} ) {
             my ( $software, $version ) =
-                $ENV{MOD_PERL} =~ /^(\S+)\/(\d+(?:[\.\_]\d+)+)/;
-
+              $ENV{MOD_PERL} =~ /^(\S+)\/(\d+(?:[\.\_]\d+)+)/;
             $version =~ s/_//g;
+            $version =~ s/(\.[^.]+)\./$1/g;
+
             if ( $software eq 'mod_perl' ) {
                 if ( $version >= 1.99922 ) {
                     $engine = 'Apache2';
@@ -35,6 +36,7 @@ around guess => sub {
             }
         }
     }
+
     return $engine;
 };