X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=a3a3056f168e49ca52608f4162d3305fce859ac8;hp=7f65f849442d63dea15382b36563073f03b67ff5;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=f38e6b6a9dd6aa97d14b8477dbd2139aa474aaee

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 7f65f84..a3a3056 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -60,23 +60,36 @@ typedef int STATUS;
 #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 /* return object(values) */
-#define RETVAL_OBJECT(o) \
-	RETVAL_OBJVAL((o)->value.obj)
-#define RETURN_OBJECT(o) \
-	RETVAL_OBJECT(o); \
+#define RETVAL_OBJECT(o, addref) \
+	RETVAL_OBJVAL((o)->value.obj, addref)
+#define RETURN_OBJECT(o, addref) \
+	RETVAL_OBJECT(o, addref); \
 	return
-#define RETVAL_OBJVAL(ov) \
-	ZVAL_OBJVAL(return_value, ov) \
-	if (Z_OBJ_HT_P(return_value)->add_ref) { \
-		Z_OBJ_HT_P(return_value)->add_ref(return_value TSRMLS_CC); \
-	}
-#define RETURN_OBJVAL(ov) \
-	RETVAL_OBJVAL(ov); \
+#define RETVAL_OBJVAL(ov, addref) \
+	ZVAL_OBJVAL(return_value, ov, addref)
+#define RETURN_OBJVAL(ov, addref) \
+	RETVAL_OBJVAL(ov, addref); \
 	return
-#define ZVAL_OBJVAL(zv, ov) \
+#define ZVAL_OBJVAL(zv, ov, addref) \
 	(zv)->type = IS_OBJECT; \
-	(zv)->value.obj = (ov);
-	
+	(zv)->value.obj = (ov);\
+	if (addref && Z_OBJ_HT_P(zv)->add_ref) { \
+		Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \
+	}
+/* return property */
+#define RETVAL_PROP(n) RETVAL_PROP_EX(getThis(), n)
+#define RETURN_PROP(n) RETURN_PROP_EX(getThis(), n)
+#define RETVAL_PROP_EX(this, n) \
+	{ \
+		zval *__prop = GET_PROP_EX(this, n); \
+		RETVAL_ZVAL(__prop, 1, 0); \
+	}
+#define RETURN_PROP_EX(this, n) \
+	{ \
+		zval *__prop = GET_PROP_EX(this, n); \
+		RETURN_ZVAL(__prop, 1, 0); \
+	}
+
 /* function accepts no args */
 #define NO_ARGS \
 	if (ZEND_NUM_ARGS()) { \
@@ -96,12 +109,10 @@ typedef int STATUS;
 #define HTTP_DEFAULT_CACHECONTROL "private, must-revalidate, max-age=0"
 
 /* max URL length */
-#define HTTP_URL_MAXLEN 2048
-#define HTTP_URI_MAXLEN HTTP_URL_MAXLEN
+#define HTTP_URL_MAXLEN 4096
 
 /* def URL arg separator */
 #define HTTP_URL_ARGSEP "&"
-#define HTTP_URI_ARGSEP HTTP_URL_ARGSEP
 
 /* send buffer size */
 #define HTTP_SENDBUF_SIZE 40960
@@ -122,6 +133,12 @@ typedef int STATUS;
 		"ACL, " \
 		/* END */
 
+#ifdef ZEND_ENGINE_2
+#	include "ext/standard/file.h"
+#	define HTTP_DEFAULT_STREAM_CONTEXT FG(default_context)
+#else
+#	define HTTP_DEFAULT_STREAM_CONTEXT NULL
+#endif
 
 #define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \
 	STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals)
@@ -132,7 +149,7 @@ typedef int STATUS;
 #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val)
 #define FOREACH_HASH_VAL(pos, hash, val) \
 	for (	zend_hash_internal_pointer_reset_ex(hash, &pos); \
-			zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+			zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
 			zend_hash_move_forward_ex(hash, &pos))
 
 #define FOREACH_KEY(pos, array, strkey, numkey) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), strkey, numkey)
@@ -151,14 +168,14 @@ typedef int STATUS;
 #define FOREACH_HASH_KEYVAL(pos, hash, strkey, numkey, val) \
 	for (	zend_hash_internal_pointer_reset_ex(hash, &pos); \
 			zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-			zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+			zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
 			zend_hash_move_forward_ex(hash, &pos))
 
-#define FOREACH_KEYLENVAL(pos, array, strkey, keylen, numkey, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), strkey, keylen, numkey, val)
+#define FOREACH_KEYLENVAL(pos, array, strkey, keylen, numkey, val) FOREACH_HASH_KEYLENVAL(pos, Z_ARRVAL_P(array), strkey, keylen, numkey, val)
 #define FOREACH_HASH_KEYLENVAL(pos, hash, strkey, keylen, numkey, val) \
 	for (	zend_hash_internal_pointer_reset_ex(hash, &pos); \
 			zend_hash_get_current_key_ex(hash, &strkey, &keylen, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-			zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+			zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
 			zend_hash_move_forward_ex(hash, &pos))
 
 #define array_copy(src, dst)	zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
@@ -173,21 +190,22 @@ typedef int STATUS;
 		 \
 		for (	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(src), &pos); \
 				zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-				zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void **) &data, &pos) == SUCCESS; \
+				zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void *) &data, &pos) == SUCCESS; \
 				zend_hash_move_forward_ex(Z_ARRVAL_P(src), &pos)) \
 		{ \
 			if (key) { \
 				zval **tmp; \
 				 \
-				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void **) &tmp)) { \
+				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void *) &tmp)) { \
 					if (Z_TYPE_PP(tmp) != IS_ARRAY) { \
 						convert_to_array_ex(tmp); \
 					} \
+					ZVAL_ADDREF(*data); \
 					add_next_index_zval(*tmp, *data); \
 				} else { \
+					ZVAL_ADDREF(*data); \
 					add_assoc_zval(dst, key, *data); \
 				} \
-				ZVAL_ADDREF(*data); \
 				key = NULL; \
 			} \
 		} \
@@ -210,7 +228,6 @@ 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)); \
-		name## _declare_default_properties(); \
 	}
 
 #	define HTTP_REGISTER_CLASS(classname, name, parent, flags) \
@@ -237,60 +254,36 @@ typedef int STATUS;
 #	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)-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 DCL_STATIC_PROP(a, t, n, v)		zend_declare_property_ ##t(OBJ_PROP_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(OBJ_PROP_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(OBJ_PROP_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 UPD_STATIC_STRL_EX(ce, n, v, l)	zend_update_static_property_stringl(ce, #n, sizeof(#n)-1, (v), (l) 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 UPD_STRL(o, n, v, l)				zend_update_property_stringl(o->zo.ce, getThis(), (#n), sizeof(#n)-1, (v), (l) 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 GET_STATIC_PROP(n)				*GET_STATIC_PROP_EX(OBJ_PROP_CE, n)
+#	define UPD_STATIC_PROP(t, n, v)			UPD_STATIC_PROP_EX(OBJ_PROP_CE, t, n, v)
+#	define SET_STATIC_PROP(n, v)			SET_STATIC_PROP_EX(OBJ_PROP_CE, n, v)
+#	define UPD_STATIC_STRL(n, v, l)			UPD_STATIC_STRL_EX(OBJ_PROP_CE, n, v, l)
+
+#	define DCL_PROP(a, t, n, v)				zend_declare_property_ ##t(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
+#	define DCL_PROP_Z(a, n, v)				zend_declare_property(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
+#	define DCL_PROP_N(a, n)					zend_declare_property_null(OBJ_PROP_CE, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a) TSRMLS_CC)
+#	define UPD_PROP(t, n, v)				UPD_PROP_EX(getThis(), t, n, v)
+#	define UPD_PROP_EX(this, t, n, v)		zend_update_property_ ##t(OBJ_PROP_CE, this, (#n), sizeof(#n)-1, (v) TSRMLS_CC)
+#	define UPD_STRL(n, v, l)				zend_update_property_stringl(OBJ_PROP_CE, getThis(), (#n), sizeof(#n)-1, (v), (l) TSRMLS_CC)
+#	define SET_PROP(n, z) 					SET_PROP_EX(getThis(), n, z)
+#	define SET_PROP_EX(this, n, z) 			zend_update_property(OBJ_PROP_CE, this, (#n), sizeof(#n)-1, (z) TSRMLS_CC)
+#	define GET_PROP(n) 						GET_PROP_EX(getThis(), n)
+#	define GET_PROP_EX(this, n) 			zend_read_property(OBJ_PROP_CE, this, (#n), sizeof(#n)-1, 0 TSRMLS_CC)
+
+#	define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(OBJ_PROP_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))))
 #	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; \
-		MAKE_STD_ZVAL(__tmp); \
-		array_init(__tmp); \
-		SET_PROP(o, n, __tmp); \
-	}
-
-#	define FREE_PARR(o, p) \
-	{ \
-		zval *__tmp = GET_PROP(o, p); \
-		if (__tmp) { \
-			zval_ptr_dtor(&__tmp); \
-		} \
-	}
-
-/*
- * the property *MUST* be updated after SEP_PROP()
- */ 
-#	define SEP_PROP(zpp) \
-	{ \
-		zval **op = zpp; \
-		SEPARATE_ZVAL_IF_NOT_REF(zpp); \
-		if (op != zpp) { \
-			zval_ptr_dtor(op); \
-		} \
-	}
-
 #	define SET_EH_THROW() SET_EH_THROW_EX(zend_exception_get_default())
 #	define SET_EH_THROW_HTTP() SET_EH_THROW_EX(http_exception_get_default())
 #	define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC)
@@ -304,9 +297,9 @@ typedef int STATUS;
 #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
+#	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
@@ -326,6 +319,7 @@ typedef int STATUS;
 #define HTTP_E_SOCKET				10L
 #define HTTP_E_RESPONSE				11L
 #define HTTP_E_URL					12L
+#define HTTP_E_QUERYSTRING			13L
 
 #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)
@@ -390,10 +384,19 @@ typedef int STATUS;
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 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();
 #	else
 #		define HTTP_DECLARE_ARG_PASS_INFO() \
-			static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE};
+			static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \
+			static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
 #	endif /* ZEND_ENGINE_2 */
 #endif /* HTTP_HAVE_CURL */