- fixed issues ifndef HTTP_HAVE_ZLIB and enable gzipped response decoding ifdef HAVE_ZLIB

[m6w6/ext-http] / http_util_object.c

diff --git a/http_util_object.c b/http_util_object.c
index ac87820f678b2f19d8d2ae2786d632e96d513dc6..42a094c914cc6a530ebb956fa5ea0377ad9e6f0f 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -69,10 +69,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 +77,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 +121,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 */