change array_list API

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index 889cb09a46d1310f1e0c34ab33d36e6103da49f2..06ec91520c2874c08b31afd661cb15128f83a1df 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
@@ -119,10 +122,6 @@ zend_php_http_globals *php_http_globals(void)
 #endif
 PHP_INI_BEGIN()
        PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
-       PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie)
-       PHP_HTTP_INI_ENTRY("http.request_datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.dns)
-       PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl)
-       PHP_HTTP_INI_ENTRY("http.request_datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.connect)
        PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
 PHP_INI_END()
 
@@ -144,16 +143,22 @@ 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)
+       || 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_request_datashare)
-       || SUCCESS != PHP_MINIT_CALL(http_request_method)
-       || SUCCESS != PHP_MINIT_CALL(http_request_pool)
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
+       || SUCCESS != PHP_MINIT_CALL(http_env_request)
        || SUCCESS != PHP_MINIT_CALL(http_env_response)
        || SUCCESS != PHP_MINIT_CALL(http_params)
        ) {
@@ -172,11 +177,11 @@ 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_curl)
 #endif
-       || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
-       || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+       || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
        ) {
                return FAILURE;
        }
@@ -188,9 +193,8 @@ PHP_RINIT_FUNCTION(http)
 {
        if (0
        || SUCCESS != PHP_RINIT_CALL(http_env)
-       || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
-#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_curl_client_pool)
 #endif
        ) {
                return FAILURE;
@@ -202,8 +206,10 @@ PHP_RINIT_FUNCTION(http)
 PHP_RSHUTDOWN_FUNCTION(http)
 {
        if (0
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+       || SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+#endif
        || SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
-       || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
        ) {
                return FAILURE;
        }
@@ -231,7 +237,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