- incorporate static property routines into missing.c

diff --git a/missing.c b/missing.c
index 328096c8a38ef427938f10767ae74fd46dc672fd..102fb4f7540d8c023d592baad33f91176e5e330e 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -18,53 +18,55 @@
 #include "php.h"
 #include "missing.h"
 
 #include "php.h"
 #include "missing.h"
 

-#if (PHP_MAJOR_VERSION == 5) && (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;
+#ifdef ZEND_ENGINE_2

 
 

+static inline zval *new_zval(zend_class_entry *ce)
+{
+       zval *z;

        if (ce->type & ZEND_INTERNAL_CLASS) {
        if (ce->type & ZEND_INTERNAL_CLASS) {

-               property = malloc(sizeof(zval));
+               z = malloc(sizeof(zval));

        } else {
        } else {

-               ALLOC_ZVAL(property);
+               ALLOC_ZVAL(z);

        }
        }

-       INIT_PZVAL(property);
+       INIT_PZVAL(z);
+       return z;
+}
+
+static inline zval *tmp_zval(void)
+{
+       zval *z;
+       ALLOC_ZVAL(z);
+       z->is_ref = 0;
+       z->refcount = 0;
+       return z;
+}
+
+
+#if (PHP_MAJOR_VERSION == 5) && (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_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {
        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {

-       zval *tmp;
-
-       ALLOC_ZVAL(tmp);
-       tmp->is_ref = 0;
-       tmp->refcount = 0;
+       zval *tmp = tmp_zval();

        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {
        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp 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;
-
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               property = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(property);
-       }
-       INIT_PZVAL(property);
+       zval *property = new_zval(ce);

        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
 {
        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
 {

-       zval *tmp;
-
-       ALLOC_ZVAL(tmp);
-       tmp->is_ref = 0;
-       tmp->refcount = 0;
+       zval *tmp = tmp_zval();

        ZVAL_BOOL(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
        ZVAL_BOOL(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }


@@ -73,18 +75,6 @@ void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name
 
 #if (PHP_MAJOR_VERSION >= 5)
 
 
 #if (PHP_MAJOR_VERSION >= 5)
 

-static inline zval *new_class_constant_zval(zend_class_entry *ce)
-{
-       zval *z;
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               z = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(z);
-       }
-       INIT_PZVAL(z);
-       return z;
-}
-

 int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC)
 {
        return zend_hash_add(&ce->constants_table, name, name_length, &value, sizeof(zval *), NULL);
 int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC)
 {
        return zend_hash_add(&ce->constants_table, name, name_length, &value, sizeof(zval *), NULL);


@@ -92,21 +82,21 @@ int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_le
 
 int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long 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_class_constant_zval(ce);
+       zval *constant = new_zval(ce);

        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_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_class_constant_zval(ce);
+       zval *constant = new_zval(ce);

        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_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_class_constant_zval(ce);
+       zval *constant = new_zval(ce);

        ZVAL_DOUBLE(constant, value);
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
        ZVAL_DOUBLE(constant, value);
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }


@@ -118,7 +108,7 @@ int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t
 
 int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC)
 {
 
 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_class_constant_zval(ce);
+       zval *constant = new_zval(ce);

        if (ce->type & ZEND_INTERNAL_CLASS) {
                ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0);
        } else {
        if (ce->type & ZEND_INTERNAL_CLASS) {
                ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0);
        } else {


@@ -126,6 +116,166 @@ int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t
        }
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
        }
        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;
+       zval **property = NULL;
+       zend_class_entry *old_scope = EG(scope);
+       
+       EG(scope) = scope;
+       if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) {
+               EG(scope) = old_scope;
+               return FAILURE;
+       }
+       EG(scope) = old_scope;
+       if (*property == value) {
+               return SUCCESS;
+       }
+       
+       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 {
+               if (PZVAL_IS_REF(*property)) {
+                       zval_dtor(*property);
+                       (*property)->type = value->type;
+                       (*property)->value = value->value;
+                       
+                       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+1, &value, sizeof(zval *), NULL);
+               }
+       }
+       
+       if (!value->refcount) {
+               zval_dtor(value);
+               FREE_ZVAL(value);
+       }
+       
+       return retval;
+}
+
+int zend_update_static_property_bool(zend_class_entry *scope, char *name, size_t name_len, zend_bool value TSRMLS_DC)
+{
+       zval *tmp = tmp_zval();
+       ZVAL_BOOL(tmp, value);
+       return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
+}
+
+int zend_update_static_property_long(zend_class_entry *scope, char *name, size_t name_len, long value TSRMLS_DC)
+{
+       zval *tmp = tmp_zval();
+       ZVAL_LONG(tmp, value);
+       return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
+}
+
+int zend_update_static_property_double(zend_class_entry *scope, char *name, size_t name_len, double value TSRMLS_DC)
+{
+       zval *tmp = tmp_zval();
+       ZVAL_DOUBLE(tmp, value);
+       return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
+}
+
+int zend_update_static_property_string(zend_class_entry *scope, char *name, size_t name_len, char *value TSRMLS_DC)
+{
+       zval *tmp = tmp_zval();
+       ZVAL_STRING(tmp, value, 1);
+       return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
+}
+
+int zend_update_static_property_stringl(zend_class_entry *scope, char *name, size_t name_len, char *value, size_t value_len TSRMLS_DC)
+{
+       zval *tmp = tmp_zval();
+       ZVAL_STRINGL(tmp, value, value_len, 1);
+       return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
+}
+
+#endif

 #endif
 
 /*
 #endif
 
 /*

diff --git a/missing.h b/missing.h
index 71868183aea962554c242c324bd239374d562a55..028767a098d31f3e89ee71419e18fe5611102feb 100644 (file)
--- a/missing.h
+++ b/missing.h
@@ -20,6 +20,8 @@
 
 #include "php_version.h"
 
 
 #include "php_version.h"
 

+#ifdef ZEND_ENGINE_2
+

 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
 extern int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC);
 extern void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC);
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
 extern int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC);
 extern void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC);


@@ -29,15 +31,23 @@ extern void zend_update_property_bool(zend_class_entry *scope, zval *object, cha
 #endif
 
 #if (PHP_MAJOR_VERSION >= 5)
 #endif
 
 #if (PHP_MAJOR_VERSION >= 5)

-int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC);
-int zend_declare_class_constant_null(zend_class_entry *ce, char *name, size_t name_length TSRMLS_DC);
-int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC);
-int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC);
-int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC);
-int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t name_length, char *value TSRMLS_DC);
-int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC);
+extern int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC);
+extern int zend_declare_class_constant_null(zend_class_entry *ce, char *name, size_t name_length TSRMLS_DC);
+extern int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC);
+extern int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC);
+extern int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC);
+extern int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t name_length, char *value TSRMLS_DC);
+extern int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC);

 #endif
 
 #endif
 

+extern int zend_update_static_property(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC);
+extern int zend_update_static_property_bool(zend_class_entry *scope, char *name, size_t name_len, zend_bool value TSRMLS_DC);
+extern int zend_update_static_property_long(zend_class_entry *scope, char *name, size_t name_len, long value TSRMLS_DC);
+extern int zend_update_static_property_double(zend_class_entry *scope, char *name, size_t name_len, double value TSRMLS_DC);
+extern int zend_update_static_property_string(zend_class_entry *scope, char *name, size_t name_len, char *value TSRMLS_DC);
+extern int zend_update_static_property_stringl(zend_class_entry *scope, char *name, size_t name_len, char *value, size_t value_len TSRMLS_DC);
+
+#endif

 #endif
 
 /*
 #endif
 
 /*

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 93b5f65ef4ca6fddb566b3dbed9748229579a145..00673eb338f58585871cae1983fa5586c1dabd3e 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -212,82 +212,22 @@ typedef int STATUS;
 #else
 #      define USE_STATIC_PROP_EX(ce)
 #endif
 #else
 #      define USE_STATIC_PROP_EX(ce)
 #endif

-#      define SET_STATIC_PROP_EX(ce, n, v) \
+#      define SET_STATIC_PROP_EX(ce, n, v) zend_update_static_property(ce, #n, sizeof(#n), v TSRMLS_CC)
+#      define SET_STATIC_PROP_STRING_EX(ce, n, s, d) \

        { \
        { \

-               int refcount; \
-               zend_uchar is_ref; \
-               zval **__static = GET_STATIC_PROP_EX(ce, n); \
- \
-               refcount = (*__static)->refcount; \
-               is_ref = (*__static)->is_ref; \
-               switch (Z_TYPE_PP(__static)) \
-               { \
-                       case IS_BOOL: case IS_LONG: case IS_NULL: \
-                       break; \
-                       case IS_RESOURCE: \
-                               zend_list_delete(Z_LVAL_PP(__static)); \
-                       break; \
-                       case IS_STRING: case IS_CONSTANT: \
-                               free(Z_STRVAL_PP(__static)); \
-                       break; \
-                       case IS_OBJECT: \
-                               Z_OBJ_HT_PP(__static)->del_ref(*__static TSRMLS_CC); \
-                       break; \
-                       case IS_ARRAY: case IS_CONSTANT_ARRAY: \
-                               if (Z_ARRVAL_PP(__static) && Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \
-                                       zend_hash_destroy(Z_ARRVAL_PP(__static)); \
-                                       free(Z_ARRVAL_PP(__static)); \
-                               } \
-                       break; \
-               } \
-               **__static = *(v); \
-               switch (Z_TYPE_PP(__static)) \
-               { \
-                       case IS_BOOL: case IS_LONG: case IS_NULL: \
-                       break; \
-                       case IS_RESOURCE: \
-                               zend_list_addref(Z_LVAL_PP(__static)); \
-                       break; \
-                       case IS_STRING: case IS_CONSTANT: \
-                               Z_STRVAL_PP(__static) = (char *) zend_strndup(Z_STRVAL_PP(__static), Z_STRLEN_PP(__static)); \
-                       break; \
-                       case IS_OBJECT: \
-                       { \
-                               Z_OBJ_HT_PP(__static)->add_ref(*__static TSRMLS_CC); \
-                       } \
-                       break; \
-                       case IS_ARRAY: case IS_CONSTANT_ARRAY: \
-                       { \
-                               if (Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \
-                                       zval *tmp; \
-                                       HashTable *old = Z_ARRVAL_PP(__static); \
-                                       Z_ARRVAL_PP(__static) = (HashTable *) malloc(sizeof(HashTable)); \
-                                       zend_hash_init(Z_ARRVAL_PP(__static), 0, NULL, ZVAL_PTR_DTOR, 0); \
-                                       zend_hash_copy(Z_ARRVAL_PP(__static), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); \
-                               } \
-                       } \
-                       break; \
+               char *c = (s); \
+               zend_update_static_property_string(ce, #n, sizeof(#n), (c) TSRMLS_CC); \
+               if (!d) { \
+                       efree(c); \

                } \
                } \

-               (*__static)->refcount = refcount; \
-               (*__static)->is_ref = is_ref; \

        }
        }

-#define SET_STATIC_PROP_STRING_EX(ce, n, s, d) \
+#      define SET_STATIC_PROP_STRINGL_EX(ce, n, s, l, d) \

        { \
        { \

-               zval *__tmp; \
-               MAKE_STD_ZVAL(__tmp); \
-               ZVAL_STRING(__tmp, (s), (d)); \
-               SET_STATIC_PROP_EX(ce, n, __tmp); \
-               zval_dtor(__tmp); \
-               efree(__tmp); \
-       }
-#define SET_STATIC_PROP_STRINGL_EX(ce, n, s, l, d) \
-       { \
-               zval *__tmp; \
-               MAKE_STD_ZVAL(__tmp); \
-               ZVAL_STRINGL(__tmp, (s), (l), (d)); \
-               SET_STATIC_PROP_EX(ce, n, __tmp); \
-               zval_dtor(__tmp); \
-               efree(__tmp); \
+               char *c = (s); \
+               zend_update_static_property_stringl(ce, #n, sizeof(#n), (c), (l) TSRMLS_CC); \
+               if (!d) { \
+                       efree(c); \
+               }\

        }
 #      define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
        }
 #      define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)