- 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 ce9a7058a64241869df9f4d8ceb2aa03bc62516b..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)
@@ -50,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)
@@ -81,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)
@@ -90,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;
@@ -115,6 +112,7 @@ 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)
@@ -126,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)