You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ph...@apache.org on 2010/02/06 20:42:36 UTC

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

Author: phred
Date: Sat Feb  6 19:42:36 2010
New Revision: 907287

URL: http://svn.apache.org/viewvc?rev=907287&view=rev
Log:
Whoops, mistakenly included untested patch in the last commit.  Reverting, and applying typo fix.

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=907287&r1=907286&r2=907287&view=diff
==============================================================================
--- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
+++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Sat Feb  6 19:42:36 2010
@@ -39,9 +39,6 @@
                                 #   a negative value de-activates ping,
                                 #   default = 0
 my %LastPingTime;               # keeps track of last ping per data_source
-my $ChildExitHandlerInstalled;  # set to true on installation of
-                                # PerlChildExitHandler
-my $InChild;
 
 # Check to see if we need to reset TaintIn and TaintOut
 my $TaintInOut = ($DBI::VERSION >= 1.31) ? 1 : 0;
@@ -221,22 +218,6 @@
     1;
 }
 
-# The PerlChildExitHandler disconnects all open connections
-sub childexit {
-
-    my $prefix = "$$ Apache::DBI            ";
-    debug(2, "$prefix PerlChildExitHandler");
-
-    foreach my $dbh (values(%Connected)) {
-        eval { DBI::db::disconnect($dbh) };
-        if ($@) {
-            debug(2, "$prefix DBI::db::disconnect failed - $@");
-        }
-    }
-
-    1;
-}
-
 # The PerlCleanupHandler is supposed to initiate a rollback after the script
 # has finished if AutoCommit is off.
 # Note: the PerlCleanupHandler runs after the response has been sent to



Re: Fwd: svn commit: r907287 - /perl/Apache-DBI/trunk/lib/Apache/DBI.pm

Posted by Fred Moyer <fr...@redhotpenguin.com>.
On Sat, Feb 6, 2010 at 12:09 PM, Adam Prime <ad...@utoronto.ca> wrote:
> That patch comes from here:
>
> http://marc.info/?l=apache-modperl&m=124810297118194&w=2
>
> it was subsequently adjusted later on in the thread.  I think it's a good
> idea, and should have been done 6 months ago when it came up the first time.

Ok I'm testing here again and then will commit it the modified patch
as shown here:

http://marc.info/?l=apache-modperl-dev&m=124824443220933&w=2

>
> Adam
>
>
> Fred Moyer wrote:
>>
>> So this was a whoops when committing a typo fix, but I think this same
>> code was submitted in a patch a while ago and I was testing it.  Any
>> comments on this approach?
>>
>> 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=907287&r1=907286&r2=907287&view=diff
>>
>> ==============================================================================
>> --- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
>> +++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Sat Feb  6 19:42:36 2010
>> @@ -39,9 +39,6 @@
>>                                #   a negative value de-activates ping,
>>                                #   default = 0
>>  my %LastPingTime;               # keeps track of last ping per
>> data_source
>> -my $ChildExitHandlerInstalled;  # set to true on installation of
>> -                                # PerlChildExitHandler
>> -my $InChild;
>>
>>  # Check to see if we need to reset TaintIn and TaintOut
>>  my $TaintInOut = ($DBI::VERSION >= 1.31) ? 1 : 0;
>> @@ -221,22 +218,6 @@
>>    1;
>>  }
>>
>> -# The PerlChildExitHandler disconnects all open connections
>> -sub childexit {
>> -
>> -    my $prefix = "$$ Apache::DBI            ";
>> -    debug(2, "$prefix PerlChildExitHandler");
>> -
>> -    foreach my $dbh (values(%Connected)) {
>> -        eval { DBI::db::disconnect($dbh) };
>> -        if ($@) {
>> -            debug(2, "$prefix DBI::db::disconnect failed - $@");
>> -        }
>> -    }
>> -
>> -    1;
>> -}
>> -
>>  # The PerlCleanupHandler is supposed to initiate a rollback after the
>> script
>>  # has finished if AutoCommit is off.
>>  # Note: the PerlCleanupHandler runs after the response has been sent to
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
>> For additional commands, e-mail: dev-help@perl.apache.org
>>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: Fwd: svn commit: r907287 - /perl/Apache-DBI/trunk/lib/Apache/DBI.pm

Posted by Adam Prime <ad...@utoronto.ca>.
That patch comes from here:

http://marc.info/?l=apache-modperl&m=124810297118194&w=2

it was subsequently adjusted later on in the thread.  I think it's a 
good idea, and should have been done 6 months ago when it came up the 
first time.

Adam


Fred Moyer wrote:
> So this was a whoops when committing a typo fix, but I think this same
> code was submitted in a patch a while ago and I was testing it.  Any
> comments on this approach?
> 
> 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=907287&r1=907286&r2=907287&view=diff
> ==============================================================================
> --- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
> +++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Sat Feb  6 19:42:36 2010
> @@ -39,9 +39,6 @@
>                                 #   a negative value de-activates ping,
>                                 #   default = 0
>  my %LastPingTime;               # keeps track of last ping per data_source
> -my $ChildExitHandlerInstalled;  # set to true on installation of
> -                                # PerlChildExitHandler
> -my $InChild;
> 
>  # Check to see if we need to reset TaintIn and TaintOut
>  my $TaintInOut = ($DBI::VERSION >= 1.31) ? 1 : 0;
> @@ -221,22 +218,6 @@
>     1;
>  }
> 
> -# The PerlChildExitHandler disconnects all open connections
> -sub childexit {
> -
> -    my $prefix = "$$ Apache::DBI            ";
> -    debug(2, "$prefix PerlChildExitHandler");
> -
> -    foreach my $dbh (values(%Connected)) {
> -        eval { DBI::db::disconnect($dbh) };
> -        if ($@) {
> -            debug(2, "$prefix DBI::db::disconnect failed - $@");
> -        }
> -    }
> -
> -    1;
> -}
> -
>  # The PerlCleanupHandler is supposed to initiate a rollback after the script
>  # has finished if AutoCommit is off.
>  # Note: the PerlCleanupHandler runs after the response has been sent to
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
> For additional commands, e-mail: dev-help@perl.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


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

Posted by Fred Moyer <fr...@redhotpenguin.com>.
So this was a whoops when committing a typo fix, but I think this same
code was submitted in a patch a while ago and I was testing it.  Any
comments on this approach?

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=907287&r1=907286&r2=907287&view=diff
==============================================================================
--- perl/Apache-DBI/trunk/lib/Apache/DBI.pm (original)
+++ perl/Apache-DBI/trunk/lib/Apache/DBI.pm Sat Feb  6 19:42:36 2010
@@ -39,9 +39,6 @@
                                #   a negative value de-activates ping,
                                #   default = 0
 my %LastPingTime;               # keeps track of last ping per data_source
-my $ChildExitHandlerInstalled;  # set to true on installation of
-                                # PerlChildExitHandler
-my $InChild;

 # Check to see if we need to reset TaintIn and TaintOut
 my $TaintInOut = ($DBI::VERSION >= 1.31) ? 1 : 0;
@@ -221,22 +218,6 @@
    1;
 }

-# The PerlChildExitHandler disconnects all open connections
-sub childexit {
-
-    my $prefix = "$$ Apache::DBI            ";
-    debug(2, "$prefix PerlChildExitHandler");
-
-    foreach my $dbh (values(%Connected)) {
-        eval { DBI::db::disconnect($dbh) };
-        if ($@) {
-            debug(2, "$prefix DBI::db::disconnect failed - $@");
-        }
-    }
-
-    1;
-}
-
 # The PerlCleanupHandler is supposed to initiate a rollback after the script
 # has finished if AutoCommit is off.
 # Note: the PerlCleanupHandler runs after the response has been sent to

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org