projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- rename http_absolute_uri to http_build_uri (complements http_build_query)
[m6w6/ext-http]
/
http_util_object.c
diff --git
a/http_util_object.c
b/http_util_object.c
index 5f4d4386caf89c90a714d5a7910cb58b983cacfe..024089d5b5c8415ce7c1a6d0ac669a4893844e1d 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_ARG_VAL(timestamp, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(
absolute
Uri, 1)
+HTTP_BEGIN_ARGS(
build
Uri, 1)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(proto, 0)
HTTP_ARG_VAL(host, 0)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(proto, 0)
HTTP_ARG_VAL(host, 0)
@@
-81,21
+81,10
@@
HTTP_BEGIN_ARGS(parseHeaders, 1)
HTTP_ARG_VAL(headers_string, 0)
HTTP_END_ARGS;
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)
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(negotiateLanguage, http_negotiate_language)
HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
HTTP_UTIL_ALIAS(matchModified, http_match_modified)
@@
-104,9
+93,8
@@
zend_function_entry http_util_object_fe[] = {
HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
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)
};
void _http_util_object_init(INIT_FUNC_ARGS)