Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 73709 invoked from network); 14 Jun 2006 14:11:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jun 2006 14:11:40 -0000 Received: (qmail 71063 invoked by uid 500); 14 Jun 2006 14:11:39 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 70963 invoked by uid 500); 14 Jun 2006 14:11:39 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 70938 invoked by uid 99); 14 Jun 2006 14:11:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jun 2006 07:11:39 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jun 2006 07:11:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5331E1A983A; Wed, 14 Jun 2006 07:11:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414265 - /apr/apr/branches/1.2.x/threadproc/unix/signals.c Date: Wed, 14 Jun 2006 14:11:17 -0000 To: commits@apr.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060614141118.5331E1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jorton Date: Wed Jun 14 07:11:17 2006 New Revision: 414265 URL: http://svn.apache.org/viewvc?rev=414265&view=rev Log: Merge r391580 from trunk: * threadproc/unix/signals.c (apr_signal, avoid_zombies): Use the Darwin zombie-avoidance hack on NetBSD too. PR: 36750 Submitted by: Todd Vierling Modified: apr/apr/branches/1.2.x/threadproc/unix/signals.c Modified: apr/apr/branches/1.2.x/threadproc/unix/signals.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/threadproc/unix/signals.c?rev=414265&r1=414264&r2=414265&view=diff ============================================================================== --- apr/apr/branches/1.2.x/threadproc/unix/signals.c (original) +++ apr/apr/branches/1.2.x/threadproc/unix/signals.c Wed Jun 14 07:11:17 2006 @@ -55,7 +55,7 @@ #if APR_HAVE_SIGACTION -#ifdef DARWIN +#if defined(__NetBSD__) || defined(DARWIN) static void avoid_zombies(int signo) { int exit_status; @@ -91,7 +91,7 @@ act.sa_flags |= SA_NOCLDWAIT; } #endif -#ifdef DARWIN +#if defined(__NetBSD__) || defined(DARWIN) /* ignoring SIGCHLD or leaving the default disposition doesn't avoid zombies, * and there is no SA_NOCLDWAIT flag, so catch the signal and reap status in * the handler to avoid zombies