X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=9d984e6e808eaeedaed829246596e307cb5216ac;hp=b1ad7c77ca046c2a8dd713cbc71a7c8b0e0e7a89;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=eabc03de1d511ce49640322859c6175f27a413e5

diff --git a/http_util_object.c b/http_util_object.c
index b1ad7c7..9d984e6 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -6,37 +6,40 @@
     | 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-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
 
+#include "ext/standard/php_http.h"
+
 #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;
 
-HTTP_BEGIN_ARGS(buildUri, 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;
+
+HTTP_BEGIN_ARGS(buildUrl, 1)
 	HTTP_ARG_VAL(url, 0)
-	HTTP_ARG_VAL(proto, 0)
-	HTTP_ARG_VAL(host, 0)
-	HTTP_ARG_VAL(port, 0)
+	HTTP_ARG_VAL(parts, 0)
+	HTTP_ARG_VAL(flags, 0)
+	HTTP_ARG_VAL(composed, 1)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(negotiateLanguage, 1)
@@ -78,29 +81,33 @@ HTTP_BEGIN_ARGS(parseHeaders, 1)
 	HTTP_ARG_VAL(headers_string, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(chunkedDecode, 1)
-	HTTP_ARG_VAL(encoded_string, 0)
+HTTP_BEGIN_ARGS(parseCookie, 1)
+	HTTP_ARG_VAL(cookie_string, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(gzEncode, 1)
-	HTTP_ARG_VAL(plain, 0)
-	HTTP_ARG_VAL(level, 0)
-	HTTP_ARG_VAL(mtime, 0)
+HTTP_BEGIN_ARGS(buildCookie, 1)
+	HTTP_ARG_VAL(cookie_array, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(gzDecode, 1)
-	HTTP_ARG_VAL(encoded, 0)
+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;
 
+#ifdef HTTP_HAVE_ZLIB
 HTTP_BEGIN_ARGS(deflate, 1)
 	HTTP_ARG_VAL(plain, 0)
-	HTTP_ARG_VAL(level, 0)
-	HTTP_ARG_VAL(zlib_header, 0)
+	HTTP_ARG_VAL(flags, 0)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(inflate, 1)
 	HTTP_ARG_VAL(encoded, 0)
 HTTP_END_ARGS;
+#endif
 
 HTTP_BEGIN_ARGS(support, 0)
 	HTTP_ARG_VAL(feature, 0)
@@ -109,7 +116,8 @@ HTTP_END_ARGS;
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
 	HTTP_UTIL_ALIAS(date, http_date)
-	HTTP_UTIL_ALIAS(buildUri, http_build_uri)
+	HTTP_UTIL_ALIAS(buildUrl, http_build_url)
+	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,10 +126,11 @@ zend_function_entry http_util_object_fe[] = {
 	HTTP_UTIL_ALIAS(matchRequestHeader, http_match_request_header)
 	HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
 	HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
+	HTTP_UTIL_ALIAS(parseCookie, http_parse_cookie)
+	HTTP_UTIL_ALIAS(buildCookie, http_build_cookie)
+	HTTP_UTIL_ALIAS(parseParams, http_parse_params)
 	HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
 #ifdef HTTP_HAVE_ZLIB
-	HTTP_UTIL_ALIAS(gzEncode, http_gzencode)
-	HTTP_UTIL_ALIAS(gzDecode, http_gzdecode)
 	HTTP_UTIL_ALIAS(deflate, http_deflate)
 	HTTP_UTIL_ALIAS(inflate, http_inflate)
 #endif /* HTTP_HAVE_ZLIB */