From: Andy Grundman Date: Fri, 26 Oct 2007 18:20:36 +0000 (+0000) Subject: Revert SIGCHLD patch pending a test X-Git-Tag: 5.7099_04~111 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6a5aa41cfee356f6d9cab2e041cec6f6f6dc8dec Revert SIGCHLD patch pending a test --- diff --git a/Changes b/Changes index e527ee8..8cc29b7 100644 --- a/Changes +++ b/Changes @@ -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 diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index 725992e..ec4ad86 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -11,7 +11,6 @@ use NEXT; 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 @@ sub run { } 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 _socket_data { 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, L.