X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=00f87743948d3450f47fb7173913453480ccd3ab;hp=eb8f5e92bb09c519a5e023469fc5028849780b8c;hb=24a9fbbdd1666d8bffb5cb771544f73fbf9a4ff1;hpb=ef227f4f7f697c954eef0adb9f9f897148a771ca

diff --git a/http.c b/http.c
index eb8f5e9..00f8774 100644
--- a/http.c
+++ b/http.c
@@ -35,6 +35,9 @@
 #ifdef HTTP_HAVE_CURL
 #	include "php_http_request_api.h"
 #endif
+#ifdef HTTP_HAVE_ZLIB
+#	include "php_http_encoding_api.h"
+#endif
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_filter_api.h"
@@ -62,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)
@@ -104,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
@@ -224,6 +224,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #endif /* HTTP_HAVE_CURL */
+#ifdef HTTP_HAVE_ZLIB
+			(SUCCESS != PHP_MINIT_CALL(http_encoding))	||
+#endif
 			(SUCCESS != PHP_MINIT_CALL(http_request_method))) {
 		return FAILURE;
 	}