From: Matteo Beccati <mbeccati@php.net>
Date: Sat, 28 Mar 2009 03:21:04 +0000 (+0000)
Subject: MFH:
X-Git-Tag: php-5.3.0RC2~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da141679cb38ef2d4bfb618bf4462b8205f4997f;p=php

MFH:
- Fixed bug #47816 (pcntl tests failing on NetBSD)
# Tests will still fail until a few kernel bugs are fixed
---

diff --git a/NEWS b/NEWS
index 11e221d766..e6dccac869 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 200?, PHP 5.3.0 RC 2
 - Undeprecated ticks. (Arnaud)
 
+- Fixed bug #47816 (pcntl tests failing on NetBSD). (Matteo)
 - Fixed bug #44861 (scrollable cursor don't work with pgsql). (Matteo)
 - Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
   (Matteo)
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 91fcea3738..e5ce729b37 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -924,6 +924,14 @@ static void pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAMETERS, int timedwait) /* {{
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
 	}
 
+	/*
+	 * sigtimedwait and sigwaitinfo can return 0 on success on some 
+	 * platforms, e.g. NetBSD
+	 */
+	if (!signo && siginfo.si_signo) {
+		signo = siginfo.si_signo;
+	}
+
 	if (signo > 0 && user_siginfo) {
 		if (Z_TYPE_P(user_siginfo) != IS_ARRAY) {
 			zval_dtor(user_siginfo);