X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=5da35c5e1ed2376ba07c0c6824159a19d142d2fa;hp=eb8f5e92bb09c519a5e023469fc5028849780b8c;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=dc76f745ce61ab266f873e80a39604fa91875c3d

diff --git a/http.c b/http.c
index eb8f5e9..5da35c5 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,10 +106,10 @@ 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)
+	PHP_FE(ob_deflatehandler, NULL)
+	PHP_FE(ob_inflatehandler, NULL)
 #endif
 	PHP_FE(http_support, NULL)
 	
@@ -157,13 +159,15 @@ static void http_globals_init_once(zend_http_globals *G)
 	memset(G, 0, sizeof(zend_http_globals));
 }
 
-static inline void http_globals_init(zend_http_globals *G)
+#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC)
+static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
 	G->send.buffer_size = HTTP_SENDBUF_SIZE;
 	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 }
 
-static inline void http_globals_free(zend_http_globals *G)
+#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
+static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
 {
 	STR_SET(G->send.content_type, NULL);
 	STR_SET(G->send.unquoted_etag, NULL);
@@ -207,6 +211,12 @@ PHP_INI_BEGIN()
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
 	HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
+#ifdef HTTP_HAVE_ZLIB
+	HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto)
+	HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
+	HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto)
+	HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
+#endif
 PHP_INI_END()
 /* }}} */
 
@@ -224,6 +234,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;
 	}
@@ -268,6 +281,13 @@ PHP_RINIT_FUNCTION(http)
 	}
 
 	http_globals_init(HTTP_GLOBALS);
+
+#ifdef HTTP_HAVE_ZLIB	
+	if (SUCCESS != PHP_RINIT_CALL(http_encoding)) {
+		return FAILURE;
+	}
+#endif
+	
 	return SUCCESS;
 }
 /* }}} */
@@ -277,9 +297,16 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
 	STATUS status = SUCCESS;
 	
+	if (
+#ifdef HTTP_HAVE_ZLIB
+		(SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) ||
+#endif
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-	status = PHP_RSHUTDOWN_CALL(http_request_method);
+		(SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) ||
 #endif
+	0) {
+		status = FAILURE;
+	}
 	
 	http_globals_free(HTTP_GLOBALS);
 	return status;