com php-src: Merge remote-tracking branch 'php/master': Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/array.c
| From: | Anatol Belski | Date: | Wed, 20 Aug 2014 19:29:49 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'php/master': Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80718@lists.php.net to get a copy of this message | ||
Commit: 6d54e899169d9caf47e0b0443ae24ecd23c9a26c
Author: Anatol Belski <ab@php.net> Wed, 20 Aug 2014 21:29:49 +0200
Parents: b3198b68453f737ade2a12e7ea47813ef402d7b4 4b337a898bd7288b8320e966d6c3ae4ec0e3cca1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d54e899169d9caf47e0b0443ae24ecd23c9a26c
Log:
Merge remote-tracking branch 'php/master'
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/standard/array.c
Diff:
diff --cc ext/standard/array.c
index 572c17f,39526c2..da6122b
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -4436,9 -4436,9 +4436,9 @@@ PHP_FUNCTION(array_map
RETVAL_NULL();
if (n_arrays == 1) {
- ulong num_key;
+ php_uint_t num_key;
zend_string *str_key;
- zval *zv;
+ zval *zv, arg;
if (Z_TYPE(arrays[0]) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #%d should be an array", 2);