X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_std_defs.h;h=1b3d3bc1107020447bc11c684620ff055c28e6c3;hb=1052c4986a794b051dc48ba4118dbd6fd8f83c49;hp=78a9ae2e2ef2dc900be36d9ca7a9dead5b8a74af;hpb=389e280e0bba312ff5ca9981801cc842dad26ec2;p=m6w6%2Fext-http

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 78a9ae2..1b3d3bc 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -165,7 +165,7 @@ typedef int STATUS;
 			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 && \
@@ -288,9 +288,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
@@ -310,6 +310,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)
@@ -377,15 +378,16 @@ typedef int STATUS;
 			ZEND_END_ARG_INFO(); \
 \
 			static \
-			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
+			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_3[] = {3, BYREF_NONE, 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 */