1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00

Merge branch '5.3' into 5.4

Conflicts:
	main/output.c
This commit is contained in:
Gustavo André dos Santos Lopes
2012-03-29 08:47:58 +01:00
+1 -1
View File
@@ -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);