]> granicus.if.org Git - php/commitdiff
this should not belong to HEAD
authorAndrey Hristov <andrey@php.net>
Wed, 28 Jan 2004 20:25:30 +0000 (20:25 +0000)
committerAndrey Hristov <andrey@php.net>
Wed, 28 Jan 2004 20:25:30 +0000 (20:25 +0000)
ext/standard/array.c

index a023c7767368deb99374edeffb83c1ca6e35388d..539848322e5990ae3918e4127d6370b3085939a5 100644 (file)
@@ -1135,12 +1135,6 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
                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 @@ PHP_FUNCTION(array_fill)
        }
        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);
        }