--- DBI.pm.orig Wed Oct 20 14:26:08 2004 +++ DBI.pm Wed Oct 20 14:41:26 2004 @@ -3,7 +3,7 @@ # $Id: DBI.pm.patch,v 1.1 2005/05/18 02:26:47 matt Exp $ -BEGIN { eval { require Apache } } +BEGIN { eval { require Apache2 } } use DBI (); use Carp qw(carp); @@ -32,7 +32,7 @@ # provide a handler which creates all connections during server startup # TODO - Should check for mod_perl 2 and do the right thing there - carp "Apache.pm was not loaded\n" and return unless $INC{'Apache.pm'}; + carp "Apache.pm was not loaded\n" and return unless $INC{'Apache2.pm'}; if(!@ChildConnect and Apache->can('push_handlers')) { Apache->push_handlers(PerlChildInitHandler => \&childinit); } @@ -207,7 +207,7 @@ return \@s; } -) if ($INC{'Apache.pm'} # is Apache.pm loaded? +) if ($INC{'Apache2.pm'} # is Apache.pm loaded? and Apache->can('module') # really? and Apache->module('Apache::Status')); # Apache::Status too?