X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=0f5f936aeb08781aae74de19d2965d2a9cd939ae;hp=5d0491a19ff14ce1db779ee34e1591e7c92c3bdb;hb=47d531af5faac1df8dedeb383867850ab430f0a1;hpb=afd561b680a07837192efbdb9ffe248def36f8e9

diff --git a/http.c b/http.c
index 5d0491a..0f5f936 100644
--- a/http.c
+++ b/http.c
@@ -30,6 +30,7 @@
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
+#include "php_http_headers_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #	include "php_http_request_api.h"
@@ -60,6 +61,9 @@
 #ifdef HTTP_HAVE_MHASH
 #	include <mhash.h>
 #endif
+#ifdef HTTP_HAVE_ZLIB
+#	include <zlib.h>
+#endif
 
 #include <ctype.h>
 
@@ -74,9 +78,10 @@ ZEND_GET_MODULE(http)
 zend_function_entry http_functions[] = {
 	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
-	PHP_FE(http_absolute_uri, NULL)
-	PHP_FE(http_negotiate_language, NULL)
-	PHP_FE(http_negotiate_charset, NULL)
+	PHP_FE(http_build_uri, NULL)
+	PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+	PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
+	PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
 	PHP_FE(http_redirect, NULL)
 	PHP_FE(http_throttle, NULL)
 	PHP_FE(http_send_status, NULL)
@@ -112,6 +117,15 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_build_query, NULL)
 #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(http_compress, NULL)
+	PHP_FE(http_uncompress, NULL)
+#endif
+	PHP_FE(http_support, NULL)
 	
 	EMPTY_FUNCTION_ENTRY
 };
@@ -263,29 +277,29 @@ PHP_MINIT_FUNCTION(http)
 
 	REGISTER_INI_ENTRIES();
 	
-	if (SUCCESS != http_cache_global_init()) {
-		return FAILURE;
-	}
-	if (SUCCESS != http_request_method_global_init()) {
-		return FAILURE;
-	}
+	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
+			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
+			(SUCCESS != PHP_MINIT_CALL(http_cache))		||
 #ifdef HTTP_HAVE_CURL
-	if (SUCCESS != http_request_global_init()) {
+			(SUCCESS != PHP_MINIT_CALL(http_request))	||
+#endif /* HTTP_HAVE_CURL */
+			(SUCCESS != PHP_MINIT_CALL(http_request_method))) {
 		return FAILURE;
 	}
-#endif /* HTTP_HAVE_CURL */
 
 #ifdef ZEND_ENGINE_2
-	http_util_object_init();
-	http_message_object_init();
+	if (	(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
+			(SUCCESS != PHP_MINIT_CALL(http_message_object))	||
 #	ifndef WONKY
-	http_response_object_init();
-#	endif
+			(SUCCESS != PHP_MINIT_CALL(http_response_object))	||
+#	endif /* WONKY */
 #	ifdef HTTP_HAVE_CURL
-	http_request_object_init();
-	http_requestpool_object_init();
+			(SUCCESS != PHP_MINIT_CALL(http_request_object))	||
+			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))	||
 #	endif /* HTTP_HAVE_CURL */
-	http_exception_object_init();
+			(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
+		return FAILURE;
+	}
 #endif /* ZEND_ENGINE_2 */
 
 	return SUCCESS;
@@ -297,7 +311,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	http_request_global_cleanup();
+	return PHP_MSHUTDOWN_CALL(http_request);
 #endif
 	return SUCCESS;
 }
@@ -320,15 +334,14 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-	int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+	STATUS status = SUCCESS;
 	
-	for (i = 0; i < c; ++i) {
-		http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
-	}
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+	status = PHP_RSHUTDOWN_CALL(http_request_method);
 #endif
+	
 	http_globals_free(HTTP_GLOBALS);
-	return SUCCESS;
+	return status;
 }
 /* }}} */
 
@@ -344,6 +357,17 @@ PHP_MINFO_FUNCTION(http)
 #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
 #ifdef HTTP_HAVE_MHASH
 		{
 			char mhash_info[32];