[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_array.c trunk/ext/spl/spl_array.c

[Dmitry Stogov]

dmitry                                   Tue, 22 Sep 2009 07:54:06 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288551

Log:
Fixed ext/spl/tests/arrayObject_magicMethods2.phpt

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
    U   php/php-src/trunk/ext/spl/spl_array.c

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_array.c    2009-09-22 07:41:16 UTC 
(rev 288550)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_array.c    2009-09-22 07:54:06 UTC 
(rev 288551)
@@ -700,6 +700,7 @@
                }

                if (intern->debug_info->nApplyCount == 0) {
+                       zend_hash_clean(intern->debug_info);
                        zend_hash_copy(intern->debug_info, 
intern->std.properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, 
sizeof(zval *));

                        storage = intern->array;

Modified: php/php-src/trunk/ext/spl/spl_array.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_array.c       2009-09-22 07:41:16 UTC (rev 
288550)
+++ php/php-src/trunk/ext/spl/spl_array.c       2009-09-22 07:54:06 UTC (rev 
288551)
@@ -703,6 +703,7 @@
                }

                if (intern->debug_info->nApplyCount == 0) {
+                       zend_hash_clean(intern->debug_info);
                        zend_hash_copy(intern->debug_info, 
intern->std.properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, 
sizeof(zval *));

                        storage = intern->array;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php