Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '5.3' into 5.4

Conflicts:
	main/output.c
  • Loading branch information...
commit f4873c68a600dcd0c6c548c9ecf2d605da878252 2 parents 616d802 + 67bf07f
@cataphract cataphract authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  ext/pcntl/pcntl.c
View
2  ext/pcntl/pcntl.c
@@ -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);
Please sign in to comment.
Something went wrong with that request. Please try again.