X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=d41ba00d1aa39161296166fbf98fe893cb5ba093;hp=4d3658716847ccc199846e58a6051404d1f228f2;hb=48981407809f0404e0427637f8474c9ccc2eafa4;hpb=781c90c0447166dd52ef881ae15751fa466c32fb

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 4d36587..d41ba00 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); \
@@ -171,6 +169,7 @@ typedef int STATUS;
 /* {{{ objects & properties */
 #ifdef ZEND_ENGINE_2
 
+#	define HTTP_STATIC_ME_ALIAS(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 
 #	define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \
 	{ \
@@ -198,9 +197,12 @@ typedef int STATUS;
 #	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)
-#	define UPD_PROP(o, t, n, v) zend_update_property_ ##t(o->zo.ce, getThis(), (#n), sizeof(#n), (v) TSRMLS_CC)
-#	define SET_PROP(o, n, z) zend_update_property(o->zo.ce, getThis(), (#n), sizeof(#n), (z) TSRMLS_CC)
-#	define GET_PROP(o, n) zend_read_property(o->zo.ce, getThis(), (#n), sizeof(#n), 0 TSRMLS_CC)
+#	define UPD_PROP(o, t, n, v) UPD_PROP_EX(o, getThis(), t, n, v)
+#	define UPD_PROP_EX(o, this, t, n, v) zend_update_property_ ##t(o->zo.ce, this, (#n), sizeof(#n), (v) TSRMLS_CC)
+#	define SET_PROP(o, n, z) SET_PROP_EX(o, getThis(), n, z)
+#	define SET_PROP_EX(o, this, n, z) zend_update_property(o->zo.ce, this, (#n), sizeof(#n), (z) TSRMLS_CC)
+#	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 INIT_PARR(o, n) \
 	{ \
@@ -242,6 +244,67 @@ typedef int STATUS;
 #define HTTP_E_URL			7L
 #define HTTP_E_MSG			8L
 
+#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 */
 
 /*