tests++

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index bba04c7b948bbb9f1f7385595a27b8707d7f682e..06ec91520c2874c08b31afd661cb15128f83a1df 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -152,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)
@@ -177,6 +177,7 @@ 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_persistent_handle)
@@ -205,6 +206,9 @@ 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)
        ) {
                return FAILURE;
@@ -233,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