#include "php.h"
#include "missing.h"
-#ifdef ZEND_ENGINE_2
+#if PHP_MAJOR_VERSION == 5
-static inline zval *new_zval(zend_class_entry *ce)
+static inline zval *new_zval(int persistent)
{
- zval *z;
- if (ce->type & ZEND_INTERNAL_CLASS) {
- z = malloc(sizeof(zval));
- } else {
- ALLOC_ZVAL(z);
- }
+ zval *z = pemalloc(sizeof(zval), persistent);
INIT_PZVAL(z);
return z;
}
return z;
}
+static void dup_zval(zval **z)
+{
+ zval_add_ref(z);
+ SEPARATE_ZVAL(z);
+}
+
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
+# if PHP_MINOR_VERSION == 0
int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
{
- zval *property = new_zval(ce);
+ zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
ZVAL_DOUBLE(property, value);
return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
}
int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
{
- zval *property = new_zval(ce);
+ zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
ZVAL_BOOL(property, value);
return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
}
zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
}
-#endif /* PHP_VERSION == 5.0 */
-
-#if (PHP_MAJOR_VERSION >= 5)
+# endif /* PHP_MINOR_VERSION == 0 */
int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC)
{
int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC)
{
- zval *constant = new_zval(ce);
+ zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
ZVAL_LONG(constant, value);
return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
}
int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC)
{
- zval *constant = new_zval(ce);
+ zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
ZVAL_BOOL(constant, value);
return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
}
int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC)
{
- zval *constant = new_zval(ce);
+ zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
ZVAL_DOUBLE(constant, value);
return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
}
int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC)
{
- zval *constant = new_zval(ce);
+ zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
if (ce->type & ZEND_INTERNAL_CLASS) {
ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0);
} else {
return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
}
-
int zend_update_static_property(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC)
{
int retval;
retval = FAILURE;
} else if (*property == value) {
retval = SUCCESS;
- } else if (scope->type & ZEND_INTERNAL_CLASS) {
- int refcount;
- zend_uchar is_ref;
-
- refcount = (*property)->refcount;
- is_ref = (*property)->is_ref;
-
- /* clean */
- switch (Z_TYPE_PP(property))
- {
- case IS_BOOL: case IS_LONG: case IS_NULL:
- break;
-
- case IS_RESOURCE:
- zend_list_delete(Z_LVAL_PP(property));
- break;
-
- case IS_STRING: case IS_CONSTANT:
- free(Z_STRVAL_PP(property));
- break;
-
- case IS_OBJECT:
- if (Z_OBJ_HT_PP(property)->del_ref) {
- Z_OBJ_HT_PP(property)->del_ref(*property TSRMLS_CC);
- }
- break;
-
- case IS_ARRAY: case IS_CONSTANT_ARRAY:
- if (Z_ARRVAL_PP(property) && Z_ARRVAL_PP(property) != &EG(symbol_table)) {
- zend_hash_destroy(Z_ARRVAL_PP(property));
- free(Z_ARRVAL_PP(property));
- }
- break;
- }
-
- /* copy */
- **property = *value;
-
- /* ctor */
- switch (Z_TYPE_PP(property))
- {
- case IS_BOOL: case IS_LONG: case IS_NULL:
- break;
-
- case IS_RESOURCE:
- zend_list_addref(Z_LVAL_PP(property));
- break;
-
- case IS_STRING: case IS_CONSTANT:
- Z_STRVAL_PP(property) = (char *) zend_strndup(Z_STRVAL_PP(property), Z_STRLEN_PP(property));
- break;
-
- case IS_OBJECT:
- if (Z_OBJ_HT_PP(property)->add_ref) {
- Z_OBJ_HT_PP(property)->add_ref(*property TSRMLS_CC);
- }
- break;
-
- case IS_ARRAY: case IS_CONSTANT_ARRAY:
- {
- if (Z_ARRVAL_PP(property) != &EG(symbol_table)) {
- zval *tmp;
- HashTable *old = Z_ARRVAL_PP(property);
-
- Z_ARRVAL_PP(property) = (HashTable *) malloc(sizeof(HashTable));
- zend_hash_init(Z_ARRVAL_PP(property), 0, NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_copy(Z_ARRVAL_PP(property), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
- }
- }
- break;
- }
-
- (*property)->refcount = refcount;
- (*property)->is_ref = is_ref;
-
- retval = SUCCESS;
-
} else {
+ value->refcount++;
if (PZVAL_IS_REF(*property)) {
zval_dtor(*property);
(*property)->type = value->type;
if (value->refcount) {
zval_copy_ctor(*property);
}
-
- retval = SUCCESS;
} else {
- value->refcount++;
- if (PZVAL_IS_REF(value)) {
- SEPARATE_ZVAL(&value);
- }
-
- retval = zend_hash_update(scope->static_members, name, name_len, &value, sizeof(zval *), NULL);
+ REPLACE_ZVAL_VALUE(property, value, 1);
}
+ retval = SUCCESS;
}
-
- if (!value->refcount) {
- zval_dtor(value);
- FREE_ZVAL(value);
- }
-
+ zval_ptr_dtor(&value);
EG(scope) = old_scope;
return retval;
return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
}
-#endif /* PHP_MAJOR_VERSION >= 5 */
-#endif /* ZEND_ENGINE_2 */
+void zend_fix_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC)
+{
+ zend_hash_copy(static_members, ce->static_members, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ zend_hash_destroy(ce->static_members);
+ zend_hash_init_ex(ce->static_members, static_members->nNumOfElements, NULL, ZVAL_PTR_DTOR, 1, 0);
+}
+
+void zend_init_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC)
+{
+ zend_hash_copy(ce->static_members, static_members, (copy_ctor_func_t) dup_zval, NULL, sizeof(zval *));
+}
+
+void zend_clean_static_properties(zend_class_entry *ce TSRMLS_DC)
+{
+ zend_hash_clean(ce->static_members);
+}
+
+#endif /* PHP_MAJOR_VERSION == 5 */
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff