--- AnyEvent/lib/AnyEvent.pm	2007/11/14 23:24:16	1.35
+++ AnyEvent/lib/AnyEvent.pm	2008/01/28 12:32:20	1.39
@@ -72,7 +72,7 @@
 
 C<fh> the Perl I<filehandle> (not filedescriptor) to watch for
 events. C<poll> must be a string that is either C<r> or C<w>, that creates
-a watcher waiting for "r"eadable or "w"ritable events. C<cb> teh callback
+a watcher waiting for "r"eadable or "w"ritable events. C<cb> the callback
 to invoke everytime the filehandle becomes ready.
 
 Only one io watcher per C<fh> and C<poll> combination is allowed (i.e. on
@@ -111,7 +111,7 @@
    });
 
    # to cancel the timer:
-   undef $w
+   undef $w;
 
 =head2 CONDITION WATCHERS
 
@@ -254,7 +254,7 @@
 
 use Carp;
 
-our $VERSION = '2.6';
+our $VERSION = '2.9';
 our $MODEL;
 
 our $AUTOLOAD;
@@ -375,11 +375,12 @@
 
 our %PID_CB;
 our $CHLD_W;
+our $CHLD_DELAY_W;
 our $PID_IDLE;
 our $WNOHANG;
 
 sub _child_wait {
-   while (0 <= (my $pid = waitpid -1, $WNOHANG)) {
+   while (0 < (my $pid = waitpid -1, $WNOHANG)) {
       $_->($pid, $?) for (values %{ $PID_CB{$pid} || {} }),
                          (values %{ $PID_CB{0}    || {} });
    }
@@ -387,6 +388,14 @@
    undef $PID_IDLE;
 }
 
+sub _sigchld {
+   # make sure we deliver these changes "synchronous" with the event loop.
+   $CHLD_DELAY_W ||= AnyEvent->timer (after => 0, cb => sub {
+      undef $CHLD_DELAY_W;
+      &_child_wait;
+   });
+}
+
 sub child {
    my (undef, %arg) = @_;
 
@@ -400,9 +409,9 @@
    }
 
    unless ($CHLD_W) {
-      $CHLD_W = AnyEvent->signal (signal => 'CHLD', cb => \&_child_wait);
-      # child could be a zombie already
-      $PID_IDLE ||= AnyEvent->timer (after => 0, cb => \&_child_wait);
+      $CHLD_W = AnyEvent->signal (signal => 'CHLD', cb => \&_sigchld);
+      # child could be a zombie already, so make at least one round
+      &_sigchld;
    }
 
    bless [$pid, $arg{cb}], "AnyEvent::Base::Child"