X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=54baa0b106b8891f7b179016afb2b2007997cb39;hp=d3ef41c2f35879ab92860f03ed3366270bdfdf17;hb=64b8eb68455c36e7e153014deaf52a6f9d2de39c;hpb=b86d629d9dcddf60e3b3abb3368f7fdab1879e7b

diff --git a/http_util_object.c b/http_util_object.c
index d3ef41c..54baa0b 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -19,39 +19,15 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
-#include "php_http_util_object.h"
 
 #ifdef ZEND_ENGINE_2
 
-#ifdef HTTP_HAVE_CURL
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_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_request_info_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();
+#include "php_http.h"
+#include "php_http_std_defs.h"
+#include "php_http_util_object.h"
 
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_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();
-#endif /* HTTP_HAVE_CURL */
+HTTP_DECLARE_ARG_PASS_INFO();
 
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
@@ -72,11 +48,12 @@ zend_function_entry http_util_object_fe[] = {
 	HTTP_STATIC_ME_ALIAS(splitResponse, http_split_response, NULL)
 	HTTP_STATIC_ME_ALIAS(parseHeaders, http_parse_headers, NULL)
 	HTTP_STATIC_ME_ALIAS(getRequestHeaders, http_get_request_headers, NULL)
+	HTTP_STATIC_ME_ALIAS(getRequestBody, http_get_request_body, NULL)
 #ifdef HTTP_HAVE_CURL
-	HTTP_STATIC_ME_ALIAS(get, http_get, http_request_info_ref_3)
-	HTTP_STATIC_ME_ALIAS(head, http_head, http_request_info_ref_3)
-	HTTP_STATIC_ME_ALIAS(postData, http_post_data, http_request_info_ref_4)
-	HTTP_STATIC_ME_ALIAS(postFields, http_post_fields, http_request_info_ref_5)
+	HTTP_STATIC_ME_ALIAS(get, http_get, http_arg_pass_ref_3)
+	HTTP_STATIC_ME_ALIAS(head, http_head, http_arg_pass_ref_3)
+	HTTP_STATIC_ME_ALIAS(postData, http_post_data, http_arg_pass_ref_4)
+	HTTP_STATIC_ME_ALIAS(postFields, http_post_fields, http_arg_pass_ref_5)
 #endif /* HTTP_HAVE_CURL */
 	HTTP_STATIC_ME_ALIAS(authBasic, http_auth_basic, NULL)
 	HTTP_STATIC_ME_ALIAS(authBasicCallback, http_auth_basic_cb, NULL)