httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Mon, 24 Nov 2003 01:34:04 GMT
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
               }
  
  
  

Mime
View raw message