$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) {
else {
my $plugin = "Catalyst::Plugin::$_";
- # Plugin caller should be our application class
- eval "package $caller; require $plugin";
+ $plugin->require;
+
if ($@) {
$caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
}
else {
- push @plugins, " $plugin";
+ push @plugins, " $plugin";
no strict 'refs';
push @{"$caller\::ISA"}, $plugin;
}