X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=ac87820f678b2f19d8d2ae2786d632e96d513dc6;hp=123c83d59cdd9a82d5fd2bed94f7d0848d7d6200;hb=693aff1dce7d26388ff36794fe4b90a26b7f2ccd;hpb=e47ee304be6758fbbfd238476f8a6bda9090fe12

diff --git a/http_util_object.c b/http_util_object.c
index 123c83d..ac87820 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -19,50 +19,87 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
+
+#ifdef ZEND_ENGINE_2
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_util_object.h"
 
-#ifdef ZEND_ENGINE_2
+#define HTTP_BEGIN_ARGS(method, req_args) 		HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method, ret_ref)		HTTP_EMPTY_ARGS_EX(HttpUtil, method, ret_ref)
+
+#define HTTP_UTIL_ALIAS(method, func)			HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
+
+HTTP_BEGIN_ARGS(date, 0)
+	HTTP_ARG_VAL(timestamp, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(buildUri, 1)
+	HTTP_ARG_VAL(url, 0)
+	HTTP_ARG_VAL(proto, 0)
+	HTTP_ARG_VAL(host, 0)
+	HTTP_ARG_VAL(port, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateLanguage, 1)
+	HTTP_ARG_VAL(supported, 0)
+	HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateCharset, 1)
+	HTTP_ARG_VAL(supported, 0)
+	HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchModified, 1)
+	HTTP_ARG_VAL(last_modified, 0)
+	HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchEtag, 1)
+	HTTP_ARG_VAL(plain_etag, 0)
+	HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchRequestHeader, 2)
+	HTTP_ARG_VAL(header_name, 0)
+	HTTP_ARG_VAL(header_value, 0)
+	HTTP_ARG_VAL(case_sensitive, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(chunkedDecode, 1)
+	HTTP_ARG_VAL(encoded_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(parseMessage, 1)
+	HTTP_ARG_VAL(message_string, 0)
+HTTP_END_ARGS;
 
-HTTP_DECLARE_ARG_PASS_INFO();
+HTTP_BEGIN_ARGS(parseHeaders, 1)
+	HTTP_ARG_VAL(headers_string, 0)
+HTTP_END_ARGS;
 
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
-	HTTP_STATIC_ME_ALIAS(date, http_date, NULL)
-	HTTP_STATIC_ME_ALIAS(absoluteURI, http_absolute_uri, NULL)
-	HTTP_STATIC_ME_ALIAS(negotiateLanguage, http_negotiate_language, NULL)
-	HTTP_STATIC_ME_ALIAS(negotiateCharset, http_negotiate_charset, NULL)
-	HTTP_STATIC_ME_ALIAS(redirect, http_redirect, NULL)
-	HTTP_STATIC_ME_ALIAS(sendStatus, http_send_status, NULL)
-	HTTP_STATIC_ME_ALIAS(sendLastModified, http_send_last_modified, NULL)
-	HTTP_STATIC_ME_ALIAS(sendContentType, http_send_content_type, NULL)
-	HTTP_STATIC_ME_ALIAS(sendContentDisposition, http_send_content_disposition, NULL)
-	HTTP_STATIC_ME_ALIAS(matchModified, http_match_modified, NULL)
-	HTTP_STATIC_ME_ALIAS(matchEtag, http_match_etag, NULL)
-	HTTP_STATIC_ME_ALIAS(cacheLastModified, http_cache_last_modified, NULL)
-	HTTP_STATIC_ME_ALIAS(cacheEtag, http_cache_etag, NULL)
-	HTTP_STATIC_ME_ALIAS(chunkedDecode, http_chunked_decode, NULL)
-	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_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)
-	{NULL, NULL, NULL}
+	HTTP_UTIL_ALIAS(date, http_date)
+	HTTP_UTIL_ALIAS(buildUri, http_build_uri)
+	HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
+	HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
+	HTTP_UTIL_ALIAS(matchModified, http_match_modified)
+	HTTP_UTIL_ALIAS(matchEtag, http_match_etag)
+	HTTP_UTIL_ALIAS(matchRequestHeader, http_match_request_header)
+	HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
+	HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
+	HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
+	
+	EMPTY_FUNCTION_ENTRY
 };
 
 void _http_util_object_init(INIT_FUNC_ARGS)
 {
-	HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, ZEND_ACC_FINAL_CLASS);
+	HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, 0);
 }
 
 #endif /* ZEND_ENGINE_2 */