Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 98523 invoked from network); 22 Nov 2003 20:43:27 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 22 Nov 2003 20:43:27 -0000 Received: (qmail 75310 invoked by uid 500); 22 Nov 2003 20:43:16 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 75134 invoked by uid 500); 22 Nov 2003 20:43:15 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 75121 invoked by uid 500); 22 Nov 2003 20:43:15 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 75116 invoked from network); 22 Nov 2003 20:43:15 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 22 Nov 2003 20:43:15 -0000 Received: (qmail 98520 invoked by uid 1121); 22 Nov 2003 20:43:25 -0000 Date: 22 Nov 2003 20:43:25 -0000 Message-ID: <20031122204325.98519.qmail@minotaur.apache.org> From: trawick@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/prefork prefork.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 trawick 2003/11/22 12:43:25 Modified: server mpm_common.c server/mpm/prefork prefork.c Log: build with latest other-child API changes Revision Changes Path 1.109 +1 -1 httpd-2.0/server/mpm_common.c Index: mpm_common.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- mpm_common.c 3 Sep 2003 19:27:09 -0000 1.108 +++ mpm_common.c 22 Nov 2003 20:43:25 -0000 1.109 @@ -193,7 +193,7 @@ } #if APR_HAS_OTHER_CHILD - apr_proc_other_child_check(); + apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART); #endif if (!not_dead_yet) { 1.283 +1 -1 httpd-2.0/server/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- prefork.c 16 Nov 2003 23:03:18 -0000 1.282 +++ prefork.c 22 Nov 2003 20:43:25 -0000 1.283 @@ -1044,7 +1044,7 @@ } #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) == APR_SUCCESS) { /* handled */ #endif }