| 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-2006, 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)
HTTP_ARG_VAL(timestamp, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(buildUri, 1)
+HTTP_BEGIN_ARGS(buildQuery, 1)
+ HTTP_ARG_VAL(query, 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)
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_END_ARGS;
-
-HTTP_BEGIN_ARGS(gzDecode, 1)
- HTTP_ARG_VAL(encoded, 0)
+HTTP_BEGIN_ARGS(chunkedDecode, 1)
+ HTTP_ARG_VAL(encoded_string, 0)
HTTP_END_ARGS;
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)
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(buildQuery, http_build_query)
HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
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 */