- CURLOPT_COOKIELIST needs curl 7.15

[m6w6/ext-http] / http_util_object.c

diff --git a/http_util_object.c b/http_util_object.c
index b1ad7c77ca046c2a8dd713cbc71a7c8b0e0e7a89..2e1d11b5665eab72e9d18fc1e91a7ef1229438b2 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -32,11 +32,10 @@ HTTP_BEGIN_ARGS(date, 0)
        HTTP_ARG_VAL(timestamp, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(buildUri, 1)
+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(composed, 1)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(negotiateLanguage, 1)
@@ -78,6 +77,10 @@ HTTP_BEGIN_ARGS(parseHeaders, 1)
        HTTP_ARG_VAL(headers_string, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(parseCookie, 1)
+       HTTP_ARG_VAL(cookie_string, 0)
+HTTP_END_ARGS;
+
 HTTP_BEGIN_ARGS(chunkedDecode, 1)
        HTTP_ARG_VAL(encoded_string, 0)
 HTTP_END_ARGS;
@@ -109,7 +112,7 @@ 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(negotiateLanguage, http_negotiate_language)
        HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
        HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
@@ -118,10 +121,9 @@ 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(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 */