svn commit: r1490646 - /perl/Apache-DBI/trunk/lib/Apache/DBI.pm

[perrin]

Author: perrin
Date: Fri Jun  7 13:41:23 2013
New Revision: 1490646

URL: http://svn.apache.org/r1490646
Log:
Fix detection of server startup to avoid caching connections in the parent 
process

Modified:
perl/Apache-DBI/trunk/lib/Apache/DBI.pm

Modified: perl/Apache-DBI/trunk/lib/Apache/DBI.pm
URL: 
http://svn.apache.org/viewvc/perl/Apache-DBI/trunk/lib/Apache/DBI.pm?rev=1490646&r1=1490645&r2=1490646&view=diff
==
--- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
+++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Fri Jun  7 13:41:23 2013
@@ -124,8 +124,10 @@ sub connect {
 # unpredictable query results.
 # See: 
http://perl.apache.org/docs/2.0/user/porting/compat.html#C__Apache__Server__Starting__and_C__Apache__Server__ReStarting_
 if (MP2) {
-require Apache2::ServerUtil;
-if (Apache2::ServerUtil::restart_count() == 1) {
+require ModPerl::Util;
+my $callback = ModPerl::Util::current_callback();
+if ($callback !~ m/Handler$/ or
+$callback =~ m/(PostConfig|OpenLogs)/) {
 debug(2, "$prefix skipping connection during server startup, read 
the docu !!");
 return $drh->connect(@args);
 }

svn commit: r1490648 - in /perl/Apache-DBI/trunk: Changes lib/Apache/DBI.pm

[perrin]

Author: perrin
Date: Fri Jun  7 13:46:30 2013
New Revision: 1490648

URL: http://svn.apache.org/r1490648
Log:
Update changes and version

Modified:
perl/Apache-DBI/trunk/Changes
perl/Apache-DBI/trunk/lib/Apache/DBI.pm

Modified: perl/Apache-DBI/trunk/Changes
URL: 
http://svn.apache.org/viewvc/perl/Apache-DBI/trunk/Changes?rev=1490648&r1=1490647&r2=1490648&view=diff
==
--- perl/Apache-DBI/trunk/Changes (original)
+++ perl/Apache-DBI/trunk/Changes Fri Jun  7 13:46:30 2013
@@ -1,6 +1,10 @@
 Revision history for ApacheDBI.
 
-1.12-dev
+1.12
+
+  - Fix detection of server startup in mod_perl 2, to avoid caching
+connections in the parent process. Perrin Harkins
+
 
 1.11 October 7, 2011
 

Modified: perl/Apache-DBI/trunk/lib/Apache/DBI.pm
URL: 
http://svn.apache.org/viewvc/perl/Apache-DBI/trunk/lib/Apache/DBI.pm?rev=1490648&r1=1490647&r2=1490648&view=diff
==
--- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
+++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Fri Jun  7 13:46:30 2013
@@ -11,6 +11,7 @@ BEGIN {
 require Apache2::Module;
 require Apache2::RequestUtil;
 require Apache2::ServerUtil;
+require ModPerl::Util;
 }
 elsif (defined $modperl::VERSION && $modperl::VERSION > 1 &&
  $modperl::VERSION < 1.99) {
@@ -22,7 +23,7 @@ use Carp ();
 
 require_version DBI 1.00;
 
-$Apache::DBI::VERSION = '1.12-dev';
+$Apache::DBI::VERSION = '1.12';
 
 # 1: report about new connect
 # 2: full debug output