X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=03429f44e167fc18858ac4ea7b71e626dd2ef678;hp=5829c194d539e0c56061bc8ddae35163f2daa67a;hb=ef227f4f7f697c954eef0adb9f9f897148a771ca;hpb=4ef2f9e39c8d7c9dc605fb062a50d8a73b52c02a

diff --git a/http_util_object.c b/http_util_object.c
index 5829c19..03429f4 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -19,12 +16,11 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_util_object.h"
 
 #define HTTP_BEGIN_ARGS(method, req_args) 		HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
@@ -53,6 +49,11 @@ HTTP_BEGIN_ARGS(negotiateCharset, 1)
 	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)
@@ -77,6 +78,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;
@@ -84,6 +89,7 @@ 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)
@@ -93,21 +99,13 @@ 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_END_ARGS;
 
 HTTP_BEGIN_ARGS(inflate, 1)
 	HTTP_ARG_VAL(encoded, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(compress, 1)
-	HTTP_ARG_VAL(plain, 0)
-	HTTP_ARG_VAL(level, 0)
-HTTP_END_ARGS;
-
-HTTP_BEGIN_ARGS(uncompress, 1)
-	HTTP_ARG_VAL(encoded, 0)
-HTTP_END_ARGS;
-
 HTTP_BEGIN_ARGS(support, 0)
 	HTTP_ARG_VAL(feature, 0)
 HTTP_END_ARGS;
@@ -118,26 +116,29 @@ zend_function_entry http_util_object_fe[] = {
 	HTTP_UTIL_ALIAS(buildUri, http_build_uri)
 	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(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)
-	HTTP_UTIL_ALIAS(compress, http_compress)
-	HTTP_UTIL_ALIAS(uncompress, http_uncompress)
+#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, 0);
+	return SUCCESS;
 }
 
 #endif /* ZEND_ENGINE_2 */