[Catalyst-commits] r7073 - in Catalyst-Runtime/5.70/trunk: . lib/Catalyst/Engine

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-10-26 19:20:36 +0100 (Fri, 26 Oct 2007)
New Revision: 7073

Modified:
   Catalyst-Runtime/5.70/trunk/Changes
   Catalyst-Runtime/5.70/trunk/lib/Catalyst/Engine/HTTP.pm
Log:
Revert SIGCHLD patch pending a test

Modified: Catalyst-Runtime/5.70/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.70/trunk/Changes	2007-10-26 14:01:19 UTC (rev 7072)
+++ Catalyst-Runtime/5.70/trunk/Changes	2007-10-26 18:20:36 UTC (rev 7073)
@@ -1,8 +1,6 @@
 # This file documents the revision history for Perl extension Catalyst.
 
 5.7012
-        - Fixed Engine::HTTP to use a proper SIGCHLD repear. Should fix issues with 
-          system() calls returning -1 instead of the correct value. (Jon Schutz)
 	- Add Catalyst::Stats (Jon Schutz)
 
 5.7011  2007-10-18 20:40:00

Modified: Catalyst-Runtime/5.70/trunk/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.70/trunk/lib/Catalyst/Engine/HTTP.pm	2007-10-26 14:01:19 UTC (rev 7072)
+++ Catalyst-Runtime/5.70/trunk/lib/Catalyst/Engine/HTTP.pm	2007-10-26 18:20:36 UTC (rev 7073)
@@ -11,7 +11,6 @@
 use Socket;
 use IO::Socket::INET ();
 use IO::Select       ();
-use POSIX ":sys_wait_h";
 
 # For PAR
 require Catalyst::Engine::HTTP::Restarter;
@@ -190,7 +189,7 @@
     }
 
     my $restart = 0;
-    local $SIG{CHLD} = \&_REAPER;
+    local $SIG{CHLD} = 'IGNORE';
 
     my $allowed = $options->{allowed} || { '127.0.0.1' => '255.255.255.255' };
     my $addr = $host ? inet_aton($host) : INADDR_ANY;
@@ -526,12 +525,6 @@
 
 sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
 
-sub _REAPER {
-    my $child;
-    while ( ( $child = waitpid( -1,WNOHANG ) ) > 0 ) { }
-    $SIG{CHLD} = \&_REAPER;
-}
-
 =head1 SEE ALSO
 
 L<Catalyst>, L<Catalyst::Engine>.