X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=14b25bcf49ab67e3cc2a52cdc554aa8af0a5527f;hp=00f87743948d3450f47fb7173913453480ccd3ab;hb=b2e9ffe535660f5de2ec850ddc0dd6e99a34724d;hpb=a19f558421040b5396b3d76e6c4878d7eda85aba

diff --git a/http.c b/http.c
index 00f8774..14b25bc 100644
--- a/http.c
+++ b/http.c
@@ -50,6 +50,10 @@
 #		include "php_http_request_object.h"
 #		include "php_http_requestpool_object.h"
 #	endif
+#	ifdef HTTP_HAVE_ZLIB
+#		include "php_http_deflatestream_object.h"
+#		include "php_http_inflatestream_object.h"
+#	endif
 #	include "php_http_exception_object.h"
 #endif
 
@@ -108,6 +112,8 @@ zend_function_entry http_functions[] = {
 #ifdef HTTP_HAVE_ZLIB
 	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 +163,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 +215,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_ALL, 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_ALL, 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()
 /* }}} */
 
@@ -242,6 +256,10 @@ PHP_MINIT_FUNCTION(http)
 			(SUCCESS != PHP_MINIT_CALL(http_request_object))	||
 			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
 #	endif /* HTTP_HAVE_CURL */
+#	ifdef HTTP_HAVE_ZLIB
+			(SUCCESS != PHP_MINIT_CALL(http_deflatestream_object))	||
+			(SUCCESS != PHP_MINIT_CALL(http_inflatestream_object))	||
+#	endif /* HTTP_HAVE_ZLIB */
 			(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
 		return FAILURE;
 	}
@@ -271,6 +289,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;
 }
 /* }}} */
@@ -280,9 +305,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;
@@ -294,29 +326,8 @@ PHP_MINFO_FUNCTION(http)
 {
 	php_info_print_table_start();
 	{
-		php_info_print_table_row(2, "Extended HTTP support", "enabled");
+		php_info_print_table_row(2, "HTTP Support", "enabled");
 		php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
-#ifdef HTTP_HAVE_CURL
-		php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
-#else
-		php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
-#endif
-#ifdef HTTP_HAVE_ZLIB
-		{
-			char my_zlib_version[64] = {0};
-			
-			strlcat(my_zlib_version, "zlib/", 63);
-			strlcat(my_zlib_version, zlibVersion(), 63);
-			php_info_print_table_row(2, "zlib GZIP Encodings", my_zlib_version);
-		}
-#else
-		php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
-#endif
-#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
-		php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
-#else
-		php_info_print_table_row(2, "magic MIME Guessing", "disabled");
-#endif
 		php_info_print_table_row(2, "Registered Classes",
 #ifndef ZEND_ENGINE_2
 			"none"
@@ -335,6 +346,28 @@ PHP_MINFO_FUNCTION(http)
 	}
 	php_info_print_table_end();
 	
+	php_info_print_table_start();
+	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
+	{
+#ifdef HTTP_HAVE_CURL
+		curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW);
+		php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version);
+#else
+		php_info_print_table_row(2, "libcurl", "disabled", "disabled");
+#endif
+#ifdef HTTP_HAVE_ZLIB
+		php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
+#else
+		php_info_print_table_row(3, "libz", "disabled", "disabled");
+#endif
+#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+		php_info_print_table_row(3, "libmagic", "unknown", "unknown");
+#else
+		php_info_print_table_row(3, "libmagic", "disabled", "disabled");
+#endif
+	}
+	php_info_print_table_end();
+	
 	php_info_print_table_start();
 	php_info_print_table_colspan_header(2, "Request Methods");
 	{