- adjust ini entry names to those of the globals struct

[m6w6/ext-http] / http_util_object.c

diff --git a/http_util_object.c b/http_util_object.c
index 6bda86dec0675f2763501beac0f1cca96152cce4..2d46aa8c84ec81a427d3df1f45878f1b996762ac 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -20,20 +20,20 @@
 
 #include "php_http_util_object.h"
 
-#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_BEGIN_ARGS(method, req_args)      HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)                                HTTP_EMPTY_ARGS_EX(HttpUtil, method, 0)
 
-#define HTTP_UTIL_ALIAS(method, func)                  HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
+#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;
 
-#ifndef PHP_WIN32
-HTTP_BEGIN_ARGS(buildQuery, 1)
+HTTP_BEGIN_ARGS(buildStr, 1)
        HTTP_ARG_VAL(query, 0)
+       HTTP_ARG_VAL(prefix, 0)
+       HTTP_ARG_VAL(arg_sep, 0)
 HTTP_END_ARGS;
-#endif
 
 HTTP_BEGIN_ARGS(buildUrl, 1)
        HTTP_ARG_VAL(url, 0)
@@ -85,6 +85,11 @@ HTTP_BEGIN_ARGS(parseCookie, 1)
        HTTP_ARG_VAL(cookie_string, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(parseParams, 1)
+       HTTP_ARG_VAL(param_string, 0)
+       HTTP_ARG_VAL(flags, 0)
+HTTP_END_ARGS;
+
 HTTP_BEGIN_ARGS(chunkedDecode, 1)
        HTTP_ARG_VAL(encoded_string, 0)
 HTTP_END_ARGS;
@@ -106,9 +111,7 @@ zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
        HTTP_UTIL_ALIAS(date, http_date)
        HTTP_UTIL_ALIAS(buildUrl, http_build_url)
-#ifndef PHP_WIN32
-       HTTP_UTIL_ALIAS(buildQuery, http_build_query)
-#endif
+       HTTP_UTIL_ALIAS(buildStr, http_build_str)
        HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
        HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
        HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
@@ -118,6 +121,7 @@ zend_function_entry http_util_object_fe[] = {
        HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
        HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
        HTTP_UTIL_ALIAS(parseCookie, http_parse_cookie)
+       HTTP_UTIL_ALIAS(parseParams, http_parse_params)
        HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
 #ifdef HTTP_HAVE_ZLIB
        HTTP_UTIL_ALIAS(deflate, http_deflate)