X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=8fab46bb8e07b4f3ab69e165b612f6c47131054c;hp=6785d59ffa0a3d5e4f3452b26bc84a92f501d1a0;hb=3f47fc4cd2911b718b155de4e37752db9fa4f8c8;hpb=b46d0197c4402e76c2608ba972e1d05db22a321a

diff --git a/http_util_object.c b/http_util_object.c
index 6785d59..8fab46b 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -36,7 +36,7 @@ HTTP_BEGIN_ARGS(date, 0)
 	HTTP_ARG_VAL(timestamp, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(absoluteUri, 1)
+HTTP_BEGIN_ARGS(buildUri, 1)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(proto, 0)
 	HTTP_ARG_VAL(host, 0)
@@ -45,12 +45,12 @@ HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(negotiateLanguage, 1)
 	HTTP_ARG_VAL(supported, 0)
-	HTTP_ARG_VAL(default, 0)
+	HTTP_ARG_VAL(result, 1)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(negotiateCharset, 1)
 	HTTP_ARG_VAL(supported, 0)
-	HTTP_ARG_VAL(default, 0)
+	HTTP_ARG_VAL(result, 1)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(matchModified, 1)
@@ -69,10 +69,6 @@ HTTP_BEGIN_ARGS(matchRequestHeader, 2)
 	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;
@@ -81,19 +77,57 @@ 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_END_ARGS;
+
+HTTP_BEGIN_ARGS(gzEncode, 1)
+	HTTP_ARG_VAL(plain, 0)
+	HTTP_ARG_VAL(level, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(gzDecode, 1)
+	HTTP_ARG_VAL(encoded, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(deflate, 1)
+	HTTP_ARG_VAL(plain, 0)
+	HTTP_ARG_VAL(level, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(inflate, 1)
+	HTTP_ARG_VAL(encoded, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(compress, 1)
+	HTTP_ARG_VAL(plain, 0)
+	HTTP_ARG_VAL(level, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(uncompress, 1)
+	HTTP_ARG_VAL(encoded, 0)
+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(absoluteUri, http_absolute_uri)
+	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)
-	{NULL, NULL, NULL}
+	HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
+	HTTP_UTIL_ALIAS(gzEncode, http_gzencode)
+	HTTP_UTIL_ALIAS(gzDecode, http_gzdecode)
+	HTTP_UTIL_ALIAS(deflate, http_deflate)
+	HTTP_UTIL_ALIAS(inflate, http_inflate)
+	HTTP_UTIL_ALIAS(compress, http_compress)
+	HTTP_UTIL_ALIAS(uncompress, http_uncompress)
+	
+	EMPTY_FUNCTION_ENTRY
 };
 
 void _http_util_object_init(INIT_FUNC_ARGS)