X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=00673eb338f58585871cae1983fa5586c1dabd3e;hp=f0e862e04c5814255e88220673360de67ac1e625;hb=76d019d55561c397209d49f7d594f2cfe022cdf9;hpb=9a35b7682fede86cb0167d21a67fea38a6e85181

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index f0e862e..00673eb 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -54,7 +54,6 @@ typedef int STATUS;
 	return_value->is_ref = 1; \
 	return_value->type = IS_OBJECT; \
 	return_value->value.obj = (ov); \
-	zval_add_ref(&return_value); \
 	zend_objects_store_add_ref(return_value TSRMLS_CC)
 #define RETURN_OBJVAL(ov) \
 	RETVAL_OBJVAL(ov); \
@@ -179,6 +178,7 @@ typedef int STATUS;
 		name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
 		name## _ce->ce_flags |= flags;  \
 		memcpy(& name## _handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+		zend_hash_init(& name## _ce->constants_table, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1); \
 		name## _declare_default_properties(); \
 	}
 
@@ -212,82 +212,22 @@ typedef int STATUS;
 #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; \
+		char *c = (s); \
+		zend_update_static_property_string(ce, #n, sizeof(#n), (c) TSRMLS_CC); \
+		if (!d) { \
+			efree(c); \
 		} \
-		**__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; \
-		} \
-		(*__static)->refcount = refcount; \
-		(*__static)->is_ref = is_ref; \
-	}
-#define SET_STATIC_PROP_STRING_EX(ce, n, s, 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) \
+#	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)
@@ -299,6 +239,8 @@ typedef int STATUS;
 #	define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n)
 #	define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n)-1, 0 TSRMLS_CC)
 
+#	define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(ce, (n), sizeof(n), (v) TSRMLS_CC)
+
 #	define ACC_PROP_PRIVATE(ce, flags)		((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope))
 #	define ACC_PROP_PROTECTED(ce, flags)	((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope))))
 #	define ACC_PROP_PUBLIC(flags)			(flags & ZEND_ACC_PUBLIC)
@@ -334,9 +276,15 @@ typedef int STATUS;
 #	define E_THROW 0
 #endif
 #define HE_THROW	E_THROW
-#define HE_NOTICE	(HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
-#define HE_WARNING	(HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
-#define HE_ERROR	(HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#ifdef ZEND_ENGINE_2
+#	define HE_NOTICE	(HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
+#	define HE_WARNING	(HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
+#	define HE_ERROR		(HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#else
+#	define HE_NOTICE	E_NOTICE
+#	define HE_WARNING	E_WARNING
+#	define HE_ERROR		E_ERROR
+#endif
 
 #define HTTP_E_RUNTIME				1L
 #define HTTP_E_INVALID_PARAM		2L