HEAD is now bundled only with ZE2

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 1f993add1ddbdab8e2e2e4d4c16399c28593bafd..b4ae53d10caf00b66b18f131039ae82b2a782335 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1135,13 +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");
                RETURN_FALSE;
@@ -1480,14 +1473,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);
        }

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 66064e87c5bdefe4acdf506a6b8984498cc7c96a..7305e9f69cbd7338dcb81afe8e216355dfd959a4 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -287,9 +287,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
                                        filtername, fdat->classname);
                        return NULL;
                }
-#ifdef ZEND_ENGINE_2
                fdat->ce = *(zend_class_entry**)fdat->ce;
-#endif
 
        }