mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-7.1' into PHP-7.2
This commit is contained in:
commit
6bf681249f
2
NEWS
2
NEWS
@ -28,6 +28,8 @@ PHP NEWS
|
||||
data connection). (Ville Hukkamäki)
|
||||
. Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
|
||||
stream_socket_client). (Ville Hukkamäki)
|
||||
. Fixed bug #75533 (array_reduce is slow when $carry is large array).
|
||||
(Manabu Matsui)
|
||||
|
||||
- XMLRPC:
|
||||
. Fixed bug #76886 (Can't build xmlrpc with expat). (Thomas Petazzoni, cmb)
|
||||
|
@ -5965,19 +5965,17 @@ PHP_FUNCTION(array_reduce)
|
||||
fci.no_separation = 0;
|
||||
|
||||
ZEND_HASH_FOREACH_VAL(htbl, operand) {
|
||||
ZVAL_COPY(&args[0], &result);
|
||||
ZVAL_COPY_VALUE(&args[0], &result);
|
||||
ZVAL_COPY(&args[1], operand);
|
||||
fci.params = args;
|
||||
|
||||
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
|
||||
zval_ptr_dtor(&args[1]);
|
||||
zval_ptr_dtor(&args[0]);
|
||||
zval_ptr_dtor(&result);
|
||||
ZVAL_COPY_VALUE(&result, &retval);
|
||||
} else {
|
||||
zval_ptr_dtor(&args[1]);
|
||||
zval_ptr_dtor(&args[0]);
|
||||
zval_ptr_dtor(&result);
|
||||
return;
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
|
Loading…
Reference in New Issue
Block a user