mbeccati Sat Mar 28 01:32:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcntl/tests pcntl_signal.phpt
Log:
MFH:
- Fixed pcntl_signal() returning NULL when passing wrong parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.17&r2=1.48.2.2.2.4.2.18&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.17
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.18
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.17 Wed Mar 25 23:34:08 2009
+++ php-src/ext/pcntl/pcntl.c Sat Mar 28 01:32:50 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.17 2009/03/25 23:34:08 lbarnaud Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.18 2009/03/28 01:32:50 mbeccati Exp $ */
#define PCNTL_DEBUG 0
@@ -757,7 +757,7 @@
zend_bool restart_syscalls = 1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz|b", &signo,
&handle, &restart_syscalls) == FAILURE) {
- return;
+ RETURN_FALSE;
}
if (!PCNTL_G(spares)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/pcntl_signal.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pcntl/tests/pcntl_signal.phpt
diff -u php-src/ext/pcntl/tests/pcntl_signal.phpt:1.1.2.2
php-src/ext/pcntl/tests/pcntl_signal.phpt:1.1.2.3
--- php-src/ext/pcntl/tests/pcntl_signal.phpt:1.1.2.2 Fri Sep 12 19:49:46 2008
+++ php-src/ext/pcntl/tests/pcntl_signal.phpt Sat Mar 28 01:32:51 2009
@@ -25,7 +25,7 @@
signal dispatched
Warning: pcntl_signal() expects at least 2 parameters, 0 given in %s
-NULL
+bool(false)
bool(true)
Warning: pcntl_signal(): Invalid value for handle argument specified in %s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
