--- AnyEvent/lib/AnyEvent.pm	2007/10/31 14:17:43	1.29
+++ AnyEvent/lib/AnyEvent.pm	2007/11/03 09:29:51	1.32
@@ -176,8 +176,10 @@
 =head2 CHILD PROCESS WATCHERS
 
 You can also listen for the status of a child process specified by the
-C<pid> argument. The watcher will only trigger once. This works by
-installing a signal handler for C<SIGCHLD>.
+C<pid> argument (or any child if the pid argument is 0). The watcher will
+trigger as often as status change for the child are received. This works
+by installing a signal handler for C<SIGCHLD>. The callback will be called with
+the pid and exit status (as returned by waitpid).
 
 Example: wait for pid 1333
 
@@ -375,8 +377,9 @@
 our $WNOHANG;
 
 sub _child_wait {
-   while (0 < (my $pid = waitpid -1, $WNOHANG)) {
-      $_->() for values %{ (delete $PID_CB{$pid}) || {} };
+   while (0 <= (my $pid = waitpid -1, $WNOHANG)) {
+      $_->($pid, $?) for (values %{ $PID_CB{$pid} || {} }),
+                         (values %{ $PID_CB{0}    || {} });
    }
 
    undef $PID_IDLE;
@@ -385,7 +388,7 @@
 sub child {
    my (undef, %arg) = @_;
 
-   my $pid = uc $arg{pid}
+   defined (my $pid = $arg{pid} + 0)
       or Carp::croak "required option 'pid' is missing";
 
    $PID_CB{$pid}{$arg{cb}} = $arg{cb};