X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.c;h=4eb0f5e9873817886702bae58603efe95932998e;hb=c5acc26cedb0caa61c7c38422ebb9d7e3aca39e7;hp=f4b7394ce3591f7920df53c0da4e8d9e892f525c;hpb=6cc24086f57aa1e8f4d6a2c12361635e7c24f60f;p=m6w6%2Fext-http

diff --git a/php_http.c b/php_http.c
index f4b7394..4eb0f5e 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
@@ -146,12 +149,13 @@ PHP_MINIT_FUNCTION(http)
 	|| 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_client_curl)
-	|| SUCCESS != PHP_MINIT_CALL(http_client_pool_curl)
-	|| SUCCESS != PHP_MINIT_CALL(http_client_datashare_curl)
 	|| SUCCESS != PHP_MINIT_CALL(http_url)
 	|| SUCCESS != PHP_MINIT_CALL(http_env)
 	|| SUCCESS != PHP_MINIT_CALL(http_env_request)
@@ -176,6 +180,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
 	) {
 		return FAILURE;
 	}
@@ -188,7 +193,7 @@ PHP_RINIT_FUNCTION(http)
 	if (0
 	|| SUCCESS != PHP_RINIT_CALL(http_env)
 #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-	|| SUCCESS != PHP_RINIT_CALL(http_client_pool_curl)
+	|| SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
 #endif
 	) {
 		return FAILURE;
@@ -228,7 +233,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