X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=65c72c1f42ac2c8aa9078777295ee511284c5cbf;hp=0e0bc142d4ca10b6cad9a540a819ff2253fded0a;hb=19cad54672b6babfac2b7c9c64c415c9a24b888a;hpb=76a1064dde808801f4988df89521a323661742aa

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 0e0bc14..65c72c1 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -46,10 +46,7 @@ typedef int STATUS;
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 /* return object(values) */
 #define RETVAL_OBJECT(o) \
-	return_value->is_ref = 1; \
-	return_value->type = IS_OBJECT; \
-	return_value->value.obj = (o)->value.obj; \
-	zval_add_ref(&return_value)
+	RETVAL_OBJVAL((o)->value.obj)
 #define RETURN_OBJECT(o) \
 	RETVAL_OBJECT(o); \
 	return
@@ -57,6 +54,7 @@ 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); \
@@ -195,7 +193,93 @@ typedef int STATUS;
 
 #	define getObject(t, o) getObjectEx(t, o, getThis())
 #	define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
-#	define OBJ_PROP(o) o->zo.properties
+#	define OBJ_PROP(o) (o)->zo.properties
+#	define DCL_STATIC_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define GET_STATIC_PROP_EX(ce, n) zend_std_get_static_property(ce, (#n), sizeof(#n), 0 TSRMLS_CC)
+#ifdef zend_update_class_constants
+#	define USE_STATIC_PROP_EX(ce) zend_update_class_constants(ce TSRMLS_CC)
+#else
+#	define USE_STATIC_PROP_EX(ce)
+#endif
+#	define SET_STATIC_PROP_EX(ce, n, v) \
+	{ \
+		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; \
+		} \
+		(*__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) \
+	{ \
+		zval *__tmp; \
+		MAKE_STD_ZVAL(__tmp); \
+		ZVAL_STRINGL(__tmp, (s), (l), (d)); \
+		SET_STATIC_PROP_EX(ce, n, __tmp); \
+		zval_dtor(__tmp); \
+		efree(__tmp); \
+	}
 #	define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #	define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #	define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a) TSRMLS_CC)
@@ -206,6 +290,11 @@ 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), 0 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)
+#	define ACC_PROP(ce, flags)				(ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
+
 #	define INIT_PARR(o, n) \
 	{ \
 		zval *__tmp; \
@@ -246,6 +335,77 @@ typedef int STATUS;
 #define HTTP_E_URL			7L
 #define HTTP_E_MSG			8L
 
+#ifdef ZEND_ENGINE_2
+#	define HTTP_BEGIN_ARGS_EX(class, method, ret_ref, req_args)	static ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 0, ret_ref, req_args)
+#	define HTTP_BEGIN_ARGS_AR(class, method, ret_ref, req_args)	static ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 1, ret_ref, req_args)
+#	define HTTP_END_ARGS										}
+#	define HTTP_EMPTY_ARGS_EX(class, method, ret_ref)			HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) HTTP_END_ARGS
+#	define HTTP_ARGS(class, method)								args_for_ ##class## _ ##method
+#	define HTTP_ARG_VAL(name, pass_ref)							ZEND_ARG_INFO(pass_ref, name)
+#	define HTTP_ARG_OBJ(class, name, allow_null)				ZEND_ARG_OBJ_INFO(1, name, class, allow_null)
+#endif
+
+#ifdef HTTP_HAVE_CURL
+#	ifdef ZEND_ENGINE_2
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO(); \
+ \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO(); \
+ \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_5, 0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO(); \
+ \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_all, 1) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO()
+#	else
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \
+			static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \
+			static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \
+			static unsigned char http_arg_pass_ref_all[]={1, BYREF_FORCE_REST}
+#	endif /* ZEND_ENGINE_2 */
+#else
+#	define HTTP_DECLARE_ARG_PASS_INFO()
+#endif /* HTTP_HAVE_CURL */
+
+
+#ifndef TSRMLS_FETCH_FROM_CTX
+#	ifdef ZTS
+#		define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
+#	else
+#		define TSRMLS_FETCH_FROM_CTX(ctx)
+#	endif
+#endif
+
+#ifndef TSRMLS_SET_CTX
+#	ifdef ZTS
+#		define TSRMLS_SET_CTX(ctx)	(void ***) ctx = tsrm_ls
+#	else
+#		define TSRMLS_SET_CTX(ctx)
+#	endif
+#endif
+
+
+
 #endif /* PHP_HTTP_STD_DEFS_H */
 
 /*