X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_util_object.c;h=ce9a7058a64241869df9f4d8ceb2aa03bc62516b;hp=024089d5b5c8415ce7c1a6d0ac669a4893844e1d;hb=8009e79e3a7b10eea99bb8534ff96189ffa281b5;hpb=2e1cd7f9942bb07d7c3a2efb79090215fc1406d6

diff --git a/http_util_object.c b/http_util_object.c
index 024089d..ce9a705 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$ */
@@ -45,12 +42,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)
@@ -69,10 +66,6 @@ HTTP_BEGIN_ARGS(matchRequestHeader, 2)
 	HTTP_ARG_VAL(case_sensitive, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(chunkedDecode, 1)
-	HTTP_ARG_VAL(encoded_string, 0)
-HTTP_END_ARGS;
-
 HTTP_BEGIN_ARGS(parseMessage, 1)
 	HTTP_ARG_VAL(message_string, 0)
 HTTP_END_ARGS;
@@ -81,6 +74,41 @@ HTTP_BEGIN_ARGS(parseHeaders, 1)
 	HTTP_ARG_VAL(headers_string, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(chunkedDecode, 1)
+	HTTP_ARG_VAL(encoded_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(gzEncode, 1)
+	HTTP_ARG_VAL(plain, 0)
+	HTTP_ARG_VAL(level, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(gzDecode, 1)
+	HTTP_ARG_VAL(encoded, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(deflate, 1)
+	HTTP_ARG_VAL(plain, 0)
+	HTTP_ARG_VAL(level, 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;
+
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
 	HTTP_UTIL_ALIAS(date, http_date)
@@ -90,16 +118,26 @@ zend_function_entry http_util_object_fe[] = {
 	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(parseMessage, http_parse_message)
 	HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
+	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 */