- CURLOPT_COOKIELIST needs curl 7.15

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 2beb4af34a37190575e472ac886d92f4e549615e..00f87743948d3450f47fb7173913453480ccd3ab 100644 (file)
--- a/http.c
+++ b/http.c
@@ -34,9 +34,9 @@
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
-#      ifdef HTTP_HAVE_WRAPPER
-#              include "php_http_wrapper_api.h"
-#      endif
+#endif
+#ifdef HTTP_HAVE_ZLIB
+#      include "php_http_encoding_api.h"
 #endif
 
 #ifdef ZEND_ENGINE_2
@@ -65,8 +65,7 @@ ZEND_GET_MODULE(http)
 zend_function_entry http_functions[] = {
        PHP_FE(http_test, NULL)
        PHP_FE(http_date, NULL)
-       PHP_FE(http_build_uri, NULL)
-       PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+       PHP_FE(http_build_url, http_arg_pass_ref_3)
        PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
        PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
        PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2)
@@ -107,8 +106,6 @@ zend_function_entry http_functions[] = {
 #endif
        PHP_FE(ob_etaghandler, NULL)
 #ifdef HTTP_HAVE_ZLIB
-       PHP_FE(http_gzencode, NULL)
-       PHP_FE(http_gzdecode, NULL)
        PHP_FE(http_deflate, NULL)
        PHP_FE(http_inflate, NULL)
 #endif
@@ -226,10 +223,10 @@ PHP_MINIT_FUNCTION(http)
                        (SUCCESS != PHP_MINIT_CALL(http_headers))       ||
 #ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
-#      ifdef HTTP_HAVE_WRAPPER
-                       (SUCCESS != PHP_MINIT_CALL(http_wrapper))       ||
-#      endif
 #endif /* HTTP_HAVE_CURL */
+#ifdef HTTP_HAVE_ZLIB
+                       (SUCCESS != PHP_MINIT_CALL(http_encoding))      ||
+#endif
                        (SUCCESS != PHP_MINIT_CALL(http_request_method))) {
                return FAILURE;
        }