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

andrey Sat Jan 17 12:33:12 2004 EDT Modified files: /php-src/ext/standard array.c user_filters.c Log: HEAD is now bundled only with ZE2 Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.255 php-src/ext/standard/array.c:1.256 --- php-src/ext/standard/array.c:1.255 Thu Jan 8 03:17:30 2004 +++ php-src/ext/standard/array.c Sat Jan 17 12:33:10 2004 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.255 2004/01/08 08:17:30 andi Exp $ */ +/* $Id: array.c,v 1.256 2004/01/17 17:33:10 andrey Exp $ */ #include "php.h" #include "php_ini.h" @@ -1135,13 +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"); RETURN_FALSE; @@ -1480,14 +1473,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); } Index: php-src/ext/standard/user_filters.c diff -u php-src/ext/standard/user_filters.c:1.23 php-src/ext/standard/user_filters.c:1.24 --- php-src/ext/standard/user_filters.c:1.23 Thu Jan 8 03:17:35 2004 +++ php-src/ext/standard/user_filters.c Sat Jan 17 12:33:11 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_filters.c,v 1.23 2004/01/08 08:17:35 andi Exp $ */ +/* $Id: user_filters.c,v 1.24 2004/01/17 17:33:11 andrey Exp $ */ #include "php.h" #include "php_globals.h" @@ -287,9 +287,7 @@ filtername, fdat->classname); return NULL; } -#ifdef ZEND_ENGINE_2 fdat->ce = *(zend_class_entry**)fdat->ce; -#endif }