- remove http_compress() and http_uncompress() (deflate/inflate ambiguity)

[m6w6/ext-http] / http_util_object.c

diff --git a/http_util_object.c b/http_util_object.c
index 2a8b469e346c092d1578bbb1828bac832632f5a0..b1ad7c77ca046c2a8dd713cbc71a7c8b0e0e7a89 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -16,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)
@@ -86,6 +85,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)
@@ -95,21 +95,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;
@@ -132,8 +124,6 @@ zend_function_entry http_util_object_fe[] = {
        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)