cvs: php-src(PHP_4_4) / NEWS /ext/standard array.c

dmitry Tue Jun 21 08:11:20 2005 EDT Modified files: (Branch: PHP_4_4) /php-src NEWS /php-src/ext/standard array.c Log: Fixed bug #31213 (Sideeffects caused by fix of bug #29493) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.6&r2=1.1247.2.920.2.7&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.6 php-src/NEWS:1.1247.2.920.2.7 --- php-src/NEWS:1.1247.2.920.2.6 Sat Jun 18 14:58:55 2005 +++ php-src/NEWS Tue Jun 21 08:11:19 2005 @@ -1,5 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2005, Version 4.4.0 +- Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry) + 13 Jun 2005, Version 4.4.0 RC1 - Added man pages for "phpize" and "php-config" scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.44.2.1&r2=1.199.2.44.2.2&ty=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.199.2.44.2.1 php-src/ext/standard/array.c:1.199.2.44.2.2 --- php-src/ext/standard/array.c:1.199.2.44.2.1 Wed Jun 8 15:55:01 2005 +++ php-src/ext/standard/array.c Tue Jun 21 08:11:19 2005 @@ -22,7 +22,7 @@ */ -/* $Id: array.c,v 1.199.2.44.2.1 2005/06/08 19:55:01 dmitry Exp $ */ +/* $Id: array.c,v 1.199.2.44.2.2 2005/06/21 12:11:19 dmitry Exp $ */ #include "php.h" #include "php_ini.h" @@ -1307,7 +1307,11 @@ *orig_var = *entry; } else { - (*entry)->is_ref = 1; + if ((*var_array)->refcount > 1) { + SEPARATE_ZVAL_TO_MAKE_IS_REF(entry); + } else { + (*entry)->is_ref = 1; + } zval_add_ref(entry); zend_hash_update(EG(active_symbol_table), final_name.c, final_name.len+1, (void **) entry, sizeof(zval *), NULL); }