iliaa Sun Mar 4 17:21:16 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array bug40709.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard array.c
Log:
Fixed bug #40709 (array_reduce() behaves strange with one item stored
arrays).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.570&r2=1.2027.2.547.2.571&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.570 php-src/NEWS:1.2027.2.547.2.571
--- php-src/NEWS:1.2027.2.547.2.570 Sat Mar 3 23:10:16 2007
+++ php-src/NEWS Sun Mar 4 17:21:15 2007
@@ -14,6 +14,8 @@
- Added --ri switch to CLI which allows to check extension information.
(Marcus)
- Added tidyNode::getParent() method (John, Nuno)
- Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
+- Fixed bug #40709 (array_reduce() behaves strange with one item stored
arrays).
+ (Ilia)
- Fixed bug #40678 (Cross compilation fails). (Tony)
- Fixed bug #40621 (Crash when constructor called inappropriately). (Tony)
- Fixed bug #40609 (Segfaults when using more than one SoapVar in a request).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.23&r2=1.308.2.21.2.24&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.23
php-src/ext/standard/array.c:1.308.2.21.2.24
--- php-src/ext/standard/array.c:1.308.2.21.2.23 Mon Jan 22 08:17:26 2007
+++ php-src/ext/standard/array.c Sun Mar 4 17:21:16 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.23 2007/01/22 08:17:26 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.24 2007/03/04 17:21:16 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -4077,10 +4077,8 @@
while (zend_hash_get_current_data_ex(htbl, (void **)&operand, &pos) ==
SUCCESS) {
if (result) {
zend_fcall_info fci;
-
args[0] = &result;
args[1] = operand;
-
fci.size = sizeof(fci);
fci.function_table = EG(function_table);
fci.function_name = *callback;
@@ -4106,7 +4104,7 @@
zend_hash_move_forward_ex(htbl, &pos);
}
- RETVAL_ZVAL(result, 0, 1);
+ RETVAL_ZVAL(result, 1, 1);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug40709.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/array/bug40709.phpt
+++ php-src/ext/standard/tests/array/bug40709.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
