- Sync with ZE1

This commit is contained in:
Andi Gutmans 2001-08-16 14:12:03 +00:00
parent ea48c0c46a
commit 290fc10af7

View File

@ -133,8 +133,9 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
ZEND_API int zval_persist(zval *zvalue TSRMLS_DC)
{
switch (zvalue->type) {
case IS_OBJECT:
case IS_RESOURCE:
return FAILURE; /* resources cannot be persisted */
return FAILURE; /* resources and objects cannot be persisted */
break;
case IS_BOOL:
case IS_LONG:
@ -155,9 +156,6 @@ ZEND_API int zval_persist(zval *zvalue TSRMLS_DC)
persist_alloc(zvalue->value.ht);
zend_hash_apply(zvalue->value.ht, (apply_func_t) zval_persist TSRMLS_CC);
break;
case IS_OBJECT:
return FAILURE; /* objects cannot be persisted */
break;
}
return SUCCESS;
}