com php-src: Merge branch '5.4': ext/pcntl/pcntl.c
| From: | Gustavo André dos Santos Lopes | Date: | Thu, 29 Mar 2012 07:48:13 +0000 |
| Subject: | com php-src: Merge branch '5.4': ext/pcntl/pcntl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68600@lists.php.net to get a copy of this message | ||
Commit: fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
Author: Gustavo André dos Santos Lopes <cataphract@php.net> Thu, 29 Mar 2012
08:48:13 +0100
Parents: 57af2875dc1bdc8768784c323d8449c02df3cff5 f4873c68a600dcd0c6c548c9ecf2d605da878252
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
Log:
Merge branch '5.4'
Changed paths:
MM ext/pcntl/pcntl.c
Diff:
fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
diff --combined ext/pcntl/pcntl.c
index 141ff58,e5910a5..ecb51c1
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@@ -760,7 -760,7 +760,7 @@@ PHP_FUNCTION(pcntl_exec
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argumnent list */
+ /* Build argument list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
@@@ -868,7 -868,7 +868,7 @@@ PHP_FUNCTION(pcntl_signal
}
/* Special long value case for SIG_DFL and SIG_IGN */
- if (Z_TYPE_P(handle)==IS_LONG) {
+ if (Z_TYPE_P(handle) == IS_LONG) {
if (Z_LVAL_P(handle) != (long) SIG_DFL && Z_LVAL_P(handle) != (long) SIG_IGN) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for handle argument
specified");
RETURN_FALSE;