cvs: php-src /ext/standard array.c

andrey Wed Jan 28 15:25:30 2004 EDT Modified files: /php-src/ext/standard array.c Log: this should not belong to HEAD http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.257&r2=1.258&ty=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.257 php-src/ext/standard/array.c:1.258 --- php-src/ext/standard/array.c:1.257 Fri Jan 23 19:25:58 2004 +++ php-src/ext/standard/array.c Wed Jan 28 15:25:30 2004 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.257 2004/01/24 00:25:58 andrey Exp $ */ +/* $Id: array.c,v 1.258 2004/01/28 20:25:30 andrey Exp $ */ #include "php.h" #include "php_ini.h" @@ -1135,12 +1135,6 @@ WRONG_PARAM_COUNT; } -#ifndef ZEND_ENGINE_2 - if (Z_TYPE_PP(value) == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong datatype for first argument"); - RETURN_FALSE; - } -#endif if (Z_TYPE_PP(array) != IS_ARRAY) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong datatype for second argument"); @@ -1480,14 +1474,6 @@ } newval = *val; while (i--) { -#ifndef ZEND_ENGINE_2 - if (newval->refcount >= 62000) { - MAKE_STD_ZVAL(newval); - *newval = **val; - zval_copy_ctor(newval); - newval->refcount = 0; - } -#endif zval_add_ref(&newval); zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &newval, sizeof(zval *), NULL); }