use base 'Catalyst::Base';
use UNIVERSAL::require;
use Catalyst::Log;
+use Catalyst::Utils;
use Text::ASCIITable;
-our $CATALYST_SCRIPT_GEN = 2;
+use Path::Class;
+our $CATALYST_SCRIPT_GEN = 4;
__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
-our $VERSION = '5.03';
+our $VERSION = '5.24';
our @ISA;
=head1 NAME
my $engine = 'Catalyst::Engine::CGI';
my $dispatcher = 'Catalyst::Dispatcher';
- # Detect mod_perl
if ( $ENV{MOD_PERL} ) {
- require mod_perl;
+ my ( $software, $version ) = $ENV{MOD_PERL} =~ /^(\S+)\/(\d+(?:[\.\_]\d+)+)/;
- if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
- $engine = 'Catalyst::Engine::Apache::MP20';
+ $version =~ s/_//g;
+ $version =~ s/(\.[^.]+)\./$1/g;
+
+ if ( $software eq 'mod_perl') {
+
+ if ( $version >= 1.99922 ) {
+
+ $engine = 'Catalyst::Engine::Apache::MP20';
+
+ if ( Apache2::Request->require ) {
+ $engine = 'Catalyst::Engine::Apache::MP20::Apreq';
+ }
+ }
+
+ elsif ( $version >= 1.9901 ) {
+
+ $engine = 'Catalyst::Engine::Apache::MP19';
+
+ if ( Apache::Request->require ) {
+ $engine = 'Catalyst::Engine::Apache::MP19::Apreq';
+ }
+ }
+
+ elsif ( $version >= 1.24 ) {
+
+ $engine = 'Catalyst::Engine::Apache::MP13';
+
+ if ( Apache::Request->require ) {
+ $engine = 'Catalyst::Engine::Apache::MP13::Apreq';
+ }
+ }
+
+ else {
+ die( qq/Unsupported mod_perl version: $ENV{MOD_PERL}/ );
+ }
}
- elsif ( $mod_perl::VERSION >= 1.99 ) {
- $engine = 'Catalyst::Engine::Apache::MP19';
+
+ elsif ( $software eq 'Zeus-Perl' ) {
+ $engine = 'Catalyst::Engine::Zeus';
}
+
else {
- $engine = 'Catalyst::Engine::Apache::MP13';
+ die( qq/Unsupported mod_perl: $ENV{MOD_PERL}/ );
}
}
# Dispatcher
$dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
if $ENV{CATALYST_DISPATCHER};
+ my $appdis = $ENV{ uc($caller) . '_DISPATCHER' };
+ $dispatcher = "Catalyst::Dispatcher::$appdis" if $appdis;
$dispatcher->require;
die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
# Engine
$engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
if $ENV{CATALYST_ENGINE};
+ my $appeng = $ENV{ uc($caller) . '_ENGINE' };
+ $engine = "Catalyst::Engine::$appeng" if $appeng;
$engine->require;
die qq/Couldn't load engine "$engine", "$@"/ if $@;
+
{
no strict 'refs';
push @{"$caller\::ISA"}, $engine;
}
+
$caller->engine($engine);
$caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
+
+ # Find home
+ my $home = Catalyst::Utils::home($caller);
+
+ if ( my $h = $ENV{CATALYST_HOME} ) {
+
+ $home = $h if -d $h;
+
+ unless ( -e _ ) {
+ $caller->log->warn(qq/CATALYST_HOME does not exist "$h"/);
+ }
+
+ unless ( -e _ && -d _ ) {
+ $caller->log->warn(qq/CATALYST_HOME is not a directory "$h"/);
+ }
+ }
+
+ if ( my $h = $ENV{ uc($caller) . '_HOME' } ) {
+
+ $home = $h if -d $h;
+
+ unless ( -e _ ) {
+ my $e = uc($caller) . '_HOME';
+ $caller->log->warn(qq/$e does not exist "$h"/)
+ }
+
+ unless ( -e _ && -d _ ) {
+ my $e = uc($caller) . '_HOME';
+ $caller->log->warn(qq/$e is not a directory "$h"/);
+ }
+ }
+
+ if ( $caller->debug ) {
+ $home
+ ? ( -d $home )
+ ? $caller->log->debug(qq/Found home "$home"/)
+ : $caller->log->debug(qq/Home "$home" doesn't exist/)
+ : $caller->log->debug(q/Couldn't find home/);
+ }
+ $caller->config->{home} = $home || '';
+ $caller->config->{root} = defined $home ? dir($home)->subdir('root') : '';
}
=item $c->engine
=head1 LIMITATIONS
-mod_perl2 support are considered experimental and may contain bugs.
+mod_perl2 support is considered experimental and may contain bugs.
=head1 SUPPORT
Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
-Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg,
+Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka,
+Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg,
Tatsuhiko Miyagawa and all the others who've helped.
=head1 LICENSE