codename: client meltdown

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index 11033e54f16b530f74369f3dc37b01880ec0b0af..914d6953ca95cfa5b2d7a540a70009558c53174f 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -167,18 +167,12 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_message)
        || SUCCESS != PHP_MINIT_CALL(http_message_body)
        || SUCCESS != PHP_MINIT_CALL(http_querystring)
-       || 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)
+       || SUCCESS != PHP_MINIT_CALL(http_client_curl)
 #endif
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
@@ -201,10 +195,10 @@ 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_client_curl)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
-       || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
+       || SUCCESS != PHP_MSHUTDOWN_CALL(http_client)
        ) {
                return FAILURE;
        }
@@ -219,7 +213,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_curl_client_pool)
+       || SUCCESS != PHP_RINIT_CALL(http_client_curl)
 #endif
        ) {
                return FAILURE;
@@ -232,7 +226,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
        if (0
 #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-       || SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+       || SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
 #endif
        || SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
        ) {