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

diff --git a/php_http.c b/php_http.c
index 202317c..f4b7394 100644
--- a/php_http.c
+++ b/php_http.c
@@ -140,13 +140,18 @@ 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)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
 #endif
-	|| SUCCESS != PHP_MINIT_CALL(http_request_datashare)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_pool)
+	|| 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)
@@ -170,7 +175,6 @@ PHP_MSHUTDOWN_FUNCTION(http)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
 	) {
 		return FAILURE;
@@ -183,8 +187,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_client_pool_curl)
 #endif
 	) {
 		return FAILURE;