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

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 65c72c1..9ab75e9 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -36,10 +36,21 @@ typedef int STATUS;
 /* lenof() */
 #define lenof(S) (sizeof(S) - 1)
 
+#ifndef MIN
+#	define MIN(a,b) (a<b?a:b)
+#endif
+#ifndef MAX
+#	define MAX(a,b) (a>b?a:b)
+#endif
+
 /* STR_SET() */
-#define STR_SET(target, source) \
-	if(target) efree(target); \
-	target = source
+#ifndef STR_SET
+#	define STR_SET(STR, SET) \
+	{ \
+		STR_FREE(STR); \
+		STR = SET; \
+	}
+#endif
 
 /* return bool (v == SUCCESS) */
 #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
@@ -51,14 +62,17 @@ typedef int STATUS;
 	RETVAL_OBJECT(o); \
 	return
 #define RETVAL_OBJVAL(ov) \
-	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)
+	ZVAL_OBJVAL(return_value, ov)
 #define RETURN_OBJVAL(ov) \
 	RETVAL_OBJVAL(ov); \
 	return
+#define ZVAL_OBJVAL(zv, ov) \
+	(zv)->is_ref = 1; \
+	(zv)->type = IS_OBJECT; \
+	(zv)->value.obj = (ov); \
+	if (Z_OBJ_HT_P(zv)->add_ref) { \
+		Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \
+	}
 
 /* function accepts no args */
 #define NO_ARGS \
@@ -106,11 +120,10 @@ typedef int STATUS;
 		/* END */
 
 
-/* server vars shorthand */
-#define HTTP_SERVER_VARS Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])
-
 #define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \
 	STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals)
+#define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \
+	STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer)
 
 /* {{{ arrays */
 #define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val)
@@ -179,6 +192,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(); \
 	}
 
@@ -191,104 +205,37 @@ typedef int STATUS;
 		name## _ce->ce_flags |= flags;  \
 	}
 
+#	define HTTP_REGISTER_EXCEPTION(classname, cename, parent) \
+	{ \
+		zend_class_entry ce; \
+		INIT_CLASS_ENTRY(ce, #classname, NULL); \
+		ce.create_object = NULL; \
+		cename = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
+	}
+
 #	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 putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) t## _free, NULL TSRMLS_CC);
 #	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)
-#	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 DCL_STATIC_PROP(a, t, n, v)		zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_Z(a, n, v)		zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_N(a, n)			zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define GET_STATIC_PROP_EX(ce, n)		zend_std_get_static_property(ce, (#n), sizeof(#n)-1, 0 TSRMLS_CC)
+#	define UPD_STATIC_PROP_EX(ce, t, n, v)	zend_update_static_property_ ##t(ce, #n, sizeof(#n)-1, (v) TSRMLS_CC)
+#	define SET_STATIC_PROP_EX(ce, n, v)		zend_update_static_property(ce, #n, sizeof(#n)-1, v 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)
+#	define DCL_PROP_N(a, n)					zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a) 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)-1, (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)-1, (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)-1, 0 TSRMLS_CC)
+
+#	define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(ce, (n), sizeof(n)-1, (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))))
@@ -305,8 +252,8 @@ typedef int STATUS;
 
 #	define FREE_PARR(o, p) \
 	{ \
-		zval *__tmp = NULL; \
-		if (__tmp = GET_PROP(o, p)) { \
+		zval *__tmp = GET_PROP(o, p); \
+		if (__tmp) { \
 			zval_dtor(__tmp); \
 			FREE_ZVAL(__tmp); \
 			__tmp = NULL; \
@@ -324,16 +271,30 @@ typedef int STATUS;
 #ifndef E_THROW
 #	define E_THROW 0
 #endif
+#ifdef ZEND_ENGINE_2
+#	define HE_THROW		E_THROW TSRMLS_CC
+#	define HE_NOTICE	(HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) TSRMLS_CC
+#	define HE_WARNING	(HTTP_G(only_exceptions) ? E_THROW : E_WARNING) TSRMLS_CC
+#	define HE_ERROR		(HTTP_G(only_exceptions) ? E_THROW : E_ERROR) TSRMLS_CC
+#else
+#	define HE_THROW		E_WARNING TSRMLS_CC
+#	define HE_NOTICE	E_NOTICE TSRMLS_CC
+#	define HE_WARNING	E_WARNING TSRMLS_CC
+#	define HE_ERROR		E_ERROR TSRMLS_CC
+#endif
 
-#define HTTP_E_UNKOWN		0L
-#define HTTP_E_PARSE		1L
-#define HTTP_E_HEADER		2L
-#define HTTP_E_OBUFFER		3L
-#define HTTP_E_CURL			4L
-#define HTTP_E_ENCODE		5L
-#define HTTP_E_PARAM		6L
-#define HTTP_E_URL			7L
-#define HTTP_E_MSG			8L
+#define HTTP_E_RUNTIME				1L
+#define HTTP_E_INVALID_PARAM		2L
+#define HTTP_E_HEADER				3L
+#define HTTP_E_MALFORMED_HEADERS	4L
+#define HTTP_E_REQUEST_METHOD		5L
+#define HTTP_E_MESSAGE_TYPE			6L
+#define HTTP_E_ENCODING				7L
+#define HTTP_E_REQUEST				8L
+#define HTTP_E_REQUEST_POOL			9L
+#define HTTP_E_SOCKET				10L
+#define HTTP_E_RESPONSE				11L
+#define HTTP_E_URL					12L
 
 #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)
@@ -345,6 +306,12 @@ typedef int STATUS;
 #	define HTTP_ARG_OBJ(class, name, allow_null)				ZEND_ARG_OBJ_INFO(1, name, class, allow_null)
 #endif
 
+#ifdef ZEND_ENGINE_2
+#	define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0}
+#else
+#	define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL}
+#endif
+
 #ifdef HTTP_HAVE_CURL
 #	ifdef ZEND_ENGINE_2
 #		define HTTP_DECLARE_ARG_PASS_INFO() \
@@ -398,7 +365,7 @@ typedef int STATUS;
 
 #ifndef TSRMLS_SET_CTX
 #	ifdef ZTS
-#		define TSRMLS_SET_CTX(ctx)	(void ***) ctx = tsrm_ls
+#		define TSRMLS_SET_CTX(ctx)	ctx = (void ***) tsrm_ls
 #	else
 #		define TSRMLS_SET_CTX(ctx)
 #	endif