mirror of
https://github.com/php/php-src.git
synced 2024-11-24 18:34:21 +08:00
HEAD is now bundled only with ZE2
This commit is contained in:
parent
c28af3a660
commit
9e5df0c666
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user