fixes for windows and 5.3 compatibility

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index f4b7394ce3591f7920df53c0da4e8d9e892f525c..bba04c7b948bbb9f1f7385595a27b8707d7f682e 100644 (file)
--- 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)
 #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_curl_client)
+       || SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+       || SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
        || 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;