mbeccati Sat Mar 28 03:17:31 2009 UTC
Modified files:
/php-src/ext/pcntl pcntl.c
Log:
- Fixed bug #47816 (pcntl tests failing on NetBSD)
# Tests will still fail until a few kernel bugs are fixed
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.77 php-src/ext/pcntl/pcntl.c:1.78
--- php-src/ext/pcntl/pcntl.c:1.77 Sat Mar 28 03:11:39 2009
+++ php-src/ext/pcntl/pcntl.c Sat Mar 28 03:17:31 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.77 2009/03/28 03:11:39 mbeccati Exp $ */
+/* $Id: pcntl.c,v 1.78 2009/03/28 03:17:31 mbeccati Exp $ */
#define PCNTL_DEBUG 0
@@ -924,6 +924,14 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
