X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=06ec91520c2874c08b31afd661cb15128f83a1df;hp=d5211bcee1cefad5d718674ebf1dcd0d3fd48d1f;hb=7b028d0cbb030f9610084314f67b77907d8474a2;hpb=14aec371d6123fbedbe13ca73b6a6d5768c635cb

diff --git a/php_http.c b/php_http.c
index d5211bc..06ec915 100644
--- a/php_http.c
+++ b/php_http.c
@@ -51,6 +51,9 @@ static zend_module_dep http_module_deps[] = {
 #ifdef PHP_HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #endif
+#ifdef PHP_HTTP_HAVE_JSON
+	ZEND_MOD_REQUIRED("json")
+#endif
 #ifdef PHP_HTTP_HAVE_EVENT
 	ZEND_MOD_CONFLICTS("event")
 #endif
@@ -140,14 +143,19 @@ PHP_MINIT_FUNCTION(http)
 	|| SUCCESS != PHP_MINIT_CALL(http_message_body)
 	|| SUCCESS != PHP_MINIT_CALL(http_property_proxy)
 	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_factory)
-	|| SUCCESS != PHP_MINIT_CALL(http_request)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_interface)
+	|| SUCCESS != PHP_MINIT_CALL(http_client)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_request)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_response)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_datashare)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_pool)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_factory)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
 #endif
-	|| SUCCESS != PHP_MINIT_CALL(http_request_datashare)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_method)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_pool)
 	|| SUCCESS != PHP_MINIT_CALL(http_url)
 	|| SUCCESS != PHP_MINIT_CALL(http_env)
 	|| SUCCESS != PHP_MINIT_CALL(http_env_request)
@@ -169,10 +177,11 @@ PHP_MSHUTDOWN_FUNCTION(http)
 	if (0
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
 #if PHP_HTTP_HAVE_CURL
+	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl_client)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
 	) {
 		return FAILURE;
 	}
@@ -184,8 +193,8 @@ PHP_RINIT_FUNCTION(http)
 {
 	if (0
 	|| SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL
-	|| SUCCESS != PHP_RINIT_CALL(http_curl)
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+	|| SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
 #endif
 	) {
 		return FAILURE;
@@ -197,6 +206,9 @@ PHP_RINIT_FUNCTION(http)
 PHP_RSHUTDOWN_FUNCTION(http)
 {
 	if (0
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+#endif
 	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
 	) {
 		return FAILURE;
@@ -225,7 +237,13 @@ PHP_MINFO_FUNCTION(http)
 #endif
 
 #if PHP_HTTP_HAVE_EVENT
-	php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());
+	php_info_print_table_row(3, "libevent",
+#	ifdef LIBEVENT_VERSION
+			LIBEVENT_VERSION,
+#	else
+			PHP_HTTP_EVENT_VERSION,
+#	endif
+			event_get_version());
 #else
 	php_info_print_table_row(3, "libevent", "disabled", "disabled");
 #endif