From: Andrey Hristov <andrey@php.net>
Date: Sat, 17 Jan 2004 17:33:11 +0000 (+0000)
Subject: HEAD is now bundled only with ZE2
X-Git-Tag: php_ibase_before_split~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e5df0c666d7d0b9cf8d2d1c2c912d56cf520736;p=php

HEAD is now bundled only with ZE2
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 1f993add1d..b4ae53d10c 100644
--- 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 66064e87c5..7305e9f69c 100644
--- 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
 
 	}