cvs: php-src(PHP_5_3) / NEWS /ext/pcntl pcntl.c

mbeccati Sat Mar 28 03:21:04 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/pcntl pcntl.c Log: MFH: - 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/NEWS?r1=1.2027.2.547.2.965.2.542&r2=1.2027.2.547.2.965.2.543&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.542 php-src/NEWS:1.2027.2.547.2.965.2.543 --- php-src/NEWS:1.2027.2.547.2.965.2.542 Sat Mar 28 02:58:04 2009 +++ php-src/NEWS Sat Mar 28 03:21:04 2009 @@ -3,6 +3,7 @@ ?? ??? 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) http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.19&r2=1.48.2.2.2.4.2.20&diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.19 php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.20 --- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.19 Sat Mar 28 03:12:52 2009 +++ php-src/ext/pcntl/pcntl.c Sat Mar 28 03:21:04 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcntl.c,v 1.48.2.2.2.4.2.19 2009/03/28 03:12:52 mbeccati Exp $ */ +/* $Id: pcntl.c,v 1.48.2.2.2.4.2.20 2009/03/28 03:21:04 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);