expand #if CURL

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index e3ee6ab69aced0bf96635c70eece58b780ba41a2..128937d47737314d29235615d3b426e1b62052fe 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
@@ -149,10 +152,10 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_client_factory)
 #if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MINIT_CALL(http_curl)
-#endif
        || 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_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
        || SUCCESS != PHP_MINIT_CALL(http_env_request)