- Fixed build on php-trunk
[m6w6/ext-http] / http_util_object.c
index bae9119b15f16f67be71a2a21f6c782d3d3e3138..9d984e6e808eaeedaed829246596e307cb5216ac 100644 (file)
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
+#include "php_http.h"
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
+#ifdef ZEND_ENGINE_2
+
+#include "ext/standard/php_http.h"
 
-#include "php.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_util_object.h"
 
-#ifdef ZEND_ENGINE_2
+#define HTTP_BEGIN_ARGS(method, req_args)      HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)                                HTTP_EMPTY_ARGS_EX(HttpUtil, method, 0)
+
+#define HTTP_UTIL_ALIAS(method, func)          HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
+
+HTTP_BEGIN_ARGS(date, 0)
+       HTTP_ARG_VAL(timestamp, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(buildStr, 1)
+       HTTP_ARG_VAL(query, 0)
+       HTTP_ARG_VAL(prefix, 0)
+       HTTP_ARG_VAL(arg_sep, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(buildUrl, 1)
+       HTTP_ARG_VAL(url, 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(supported, 0)
+       HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateCharset, 1)
+       HTTP_ARG_VAL(supported, 0)
+       HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateContentType, 1)
+       HTTP_ARG_VAL(supported, 0)
+       HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchModified, 1)
+       HTTP_ARG_VAL(last_modified, 0)
+       HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchEtag, 1)
+       HTTP_ARG_VAL(plain_etag, 0)
+       HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchRequestHeader, 2)
+       HTTP_ARG_VAL(header_name, 0)
+       HTTP_ARG_VAL(header_value, 0)
+       HTTP_ARG_VAL(case_sensitive, 0)
+HTTP_END_ARGS;
+
+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(parseCookie, 1)
+       HTTP_ARG_VAL(cookie_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(buildCookie, 1)
+       HTTP_ARG_VAL(cookie_array, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(parseParams, 1)
+       HTTP_ARG_VAL(param_string, 0)
+       HTTP_ARG_VAL(flags, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(chunkedDecode, 1)
+       HTTP_ARG_VAL(encoded_string, 0)
+HTTP_END_ARGS;
+
+#ifdef HTTP_HAVE_ZLIB
+HTTP_BEGIN_ARGS(deflate, 1)
+       HTTP_ARG_VAL(plain, 0)
+       HTTP_ARG_VAL(flags, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(inflate, 1)
+       HTTP_ARG_VAL(encoded, 0)
+HTTP_END_ARGS;
+#endif
 
-#ifdef HTTP_HAVE_CURL
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_5, 0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(0)
-       ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-#endif /* HTTP_HAVE_CURL */
+HTTP_BEGIN_ARGS(support, 0)
+       HTTP_ARG_VAL(feature, 0)
+HTTP_END_ARGS;
 
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
-#define HTTP_UTIL_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-       HTTP_UTIL_ME(date, http_date, NULL)
-       HTTP_UTIL_ME(absoluteURI, http_absolute_uri, NULL)
-       HTTP_UTIL_ME(negotiateLanguage, http_negotiate_language, NULL)
-       HTTP_UTIL_ME(negotiateCharset, http_negotiate_charset, NULL)
-       HTTP_UTIL_ME(redirect, http_redirect, NULL)
-       HTTP_UTIL_ME(sendStatus, http_send_status, NULL)
-       HTTP_UTIL_ME(sendLastModified, http_send_last_modified, NULL)
-       HTTP_UTIL_ME(sendContentType, http_send_content_type, NULL)
-       HTTP_UTIL_ME(sendContentDisposition, http_send_content_disposition, NULL)
-       HTTP_UTIL_ME(matchModified, http_match_modified, NULL)
-       HTTP_UTIL_ME(matchEtag, http_match_etag, NULL)
-       HTTP_UTIL_ME(cacheLastModified, http_cache_last_modified, NULL)
-       HTTP_UTIL_ME(cacheEtag, http_cache_etag, NULL)
-       HTTP_UTIL_ME(chunkedDecode, http_chunked_decode, NULL)
-       HTTP_UTIL_ME(splitResponse, http_split_response, NULL)
-       HTTP_UTIL_ME(parseHeaders, http_parse_headers, NULL)
-       HTTP_UTIL_ME(getRequestHeaders, http_get_request_headers, NULL)
-#ifdef HTTP_HAVE_CURL
-       HTTP_UTIL_ME(get, http_get, http_request_info_ref_3)
-       HTTP_UTIL_ME(head, http_head, http_request_info_ref_3)
-       HTTP_UTIL_ME(postData, http_post_data, http_request_info_ref_4)
-       HTTP_UTIL_ME(postFields, http_post_fields, http_request_info_ref_5)
-#endif /* HTTP_HAVE_CURL */
-       HTTP_UTIL_ME(authBasic, http_auth_basic, NULL)
-       HTTP_UTIL_ME(authBasicCallback, http_auth_basic_cb, NULL)
-       {NULL, NULL, NULL}
+       HTTP_UTIL_ALIAS(date, http_date)
+       HTTP_UTIL_ALIAS(buildUrl, http_build_url)
+       HTTP_UTIL_ALIAS(buildStr, http_build_str)
+       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(matchModified, http_match_modified)
+       HTTP_UTIL_ALIAS(matchEtag, http_match_etag)
+       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(buildCookie, http_build_cookie)
+       HTTP_UTIL_ALIAS(parseParams, http_parse_params)
+       HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
+#ifdef HTTP_HAVE_ZLIB
+       HTTP_UTIL_ALIAS(deflate, http_deflate)
+       HTTP_UTIL_ALIAS(inflate, http_inflate)
+#endif /* HTTP_HAVE_ZLIB */
+       HTTP_UTIL_ALIAS(support, http_support)
+       
+       EMPTY_FUNCTION_ENTRY
 };
 
-void _http_util_object_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_util_object)
 {
-       HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, ZEND_ACC_FINAL_CLASS);
+       HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, 0);
+       return SUCCESS;
 }
 
 #endif /* ZEND_ENGINE_2 */