Return-Path: 
 <cvs-return-17395-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 24648 invoked from network); 24 Nov 2003 01:34:06 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 24 Nov 2003 01:34:06 -0000
Received: (qmail 89012 invoked by uid 500); 24 Nov 2003 01:33:49 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 88976 invoked by uid 500); 24 Nov 2003 01:33:49 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 88963 invoked by uid 500); 24 Nov 2003 01:33:49 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Received: (qmail 88959 invoked from network); 24 Nov 2003 01:33:49 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 24 Nov 2003 01:33:49 -0000
Received: (qmail 24635 invoked by uid 1402); 24 Nov 2003 01:34:04 -0000
Date: 24 Nov 2003 01:34:04 -0000
Message-ID: <20031124013404.24633.qmail@minotaur.apache.org>
From: brianp@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/worker worker.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

brianp      2003/11/23 17:34:04

  Modified:    server/mpm/beos beos.c
               server/mpm/experimental/leader leader.c
               server/mpm/experimental/perchild perchild.c
               server/mpm/experimental/threadpool threadpool.c
               server/mpm/worker worker.c
  Log:
  remove calls to the apr_proc_other_child_read function that no longer exists
  
  Revision  Changes    Path
  1.104     +2 -1      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- beos.c	3 Sep 2003 19:27:10 -0000	1.103
  +++ beos.c	24 Nov 2003 01:34:04 -0000	1.104
  @@ -687,7 +687,8 @@
   		        }
   #if APR_HAS_OTHER_CHILD
               }
  -            else if (apr_proc_other_child_read(&pid, status) == 0) {
  +            else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH,
  +                                                status) == 0) {
       		/* handled */
   #endif
               }
  
  
  
  1.33      +2 -1      httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- leader.c	16 Nov 2003 01:51:27 -0000	1.32
  +++ leader.c	24 Nov 2003 01:34:04 -0000	1.33
  @@ -1422,7 +1422,8 @@
                   }
   #if APR_HAS_OTHER_CHILD
               }
  -            else if (apr_proc_other_child_read(&pid, status) == 0) {
  +            else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH,
  +                                                status) == 0) {
                   /* handled */
   #endif
               }
  
  
  
  1.141     +2 -1      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- perchild.c	3 Sep 2003 19:27:11 -0000	1.140
  +++ perchild.c	24 Nov 2003 01:34:04 -0000	1.141
  @@ -1223,7 +1223,8 @@
                   }
   #if APR_HAS_OTHER_CHILD
               }
  -            else if (apr_proc_other_child_read(&pid, status) == 0) {
  +            else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH,
  +                                                status) == 0) {
               /* handled */
   #endif
               }
  
  
  
  1.21      +2 -1      httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- threadpool.c	5 Sep 2003 19:36:26 -0000	1.20
  +++ threadpool.c	24 Nov 2003 01:34:04 -0000	1.21
  @@ -1671,7 +1671,8 @@
                   }
   #if APR_HAS_OTHER_CHILD
               }
  -            else if (apr_proc_other_child_read(&pid, status) == 0) {
  +            else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH,
  +                                                status) == 0) {
                   /* handled */
   #endif
               }
  
  
  
  1.141     +2 -1      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- worker.c	16 Nov 2003 23:47:07 -0000	1.140
  +++ worker.c	24 Nov 2003 01:34:04 -0000	1.141
  @@ -1562,7 +1562,8 @@
                   }
   #if APR_HAS_OTHER_CHILD
               }
  -            else if (apr_proc_other_child_read(&pid, status) == 0) {
  +            else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH,
  +                                                status) == 0) {
                   /* handled */
   #endif
               }