- new signature for the negotiator, which doesn't mix return value types, but

[m6w6/ext-http] / http_util_object.c

diff --git a/http_util_object.c b/http_util_object.c
index d4c544d92c3f485adbeefde6e839c78426849c31..ac87820f678b2f19d8d2ae2786d632e96d513dc6 100644 (file)
--- 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)
@@ -73,40 +73,28 @@ HTTP_BEGIN_ARGS(chunkedDecode, 1)
        HTTP_ARG_VAL(encoded_string, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(splitResponse, 1)
-       HTTP_ARG_VAL(response_string, 0)
+HTTP_BEGIN_ARGS(parseMessage, 1)
+       HTTP_ARG_VAL(message_string, 0)
 HTTP_END_ARGS;
 
 HTTP_BEGIN_ARGS(parseHeaders, 1)
        HTTP_ARG_VAL(headers_string, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(authBasic, 2)
-       HTTP_ARG_VAL(username, 0)
-       HTTP_ARG_VAL(password, 0)
-       HTTP_ARG_VAL(realm, 0)
-HTTP_END_ARGS;
-
-HTTP_BEGIN_ARGS(authBasicCallback, 1)
-       HTTP_ARG_VAL(callback, 0)
-       HTTP_ARG_VAL(realm, 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(splitResponse, http_split_response)
+       HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
        HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
-       HTTP_UTIL_ALIAS(authBasic, http_auth_basic)
-       HTTP_UTIL_ALIAS(authBasicCallback, http_auth_basic_cb)
-       {NULL, NULL, NULL}
+       
+       EMPTY_FUNCTION_ENTRY
 };
 
 void _http_util_object_init(INIT_FUNC_ARGS)