- libevent diagnostics

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index b4ed0dfbdcd06083c61ef621912b0900522ba7b6..923748d1cba7ef1571ba2f0600173ead4e1296e9 100644 (file)
--- a/http.c
+++ b/http.c
@@ -14,6 +14,7 @@
 
 #define HTTP_WANT_SAPI
 #define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
 #define HTTP_WANT_ZLIB
 #define HTTP_WANT_MAGIC
 #include "php_http.h"
@@ -140,6 +141,9 @@ static zend_module_dep http_module_deps[] = {
 #      ifdef HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #      endif
+#      ifdef HTTP_HAVE_EVENT
+       ZEND_MOD_CONFLICTS("event")
+#endif
        {NULL, NULL, NULL, 0}
 };
 #endif
@@ -363,6 +367,9 @@ PHP_RINIT_FUNCTION(http)
 #endif
 #ifdef HTTP_HAVE_CURL
 #      ifdef ZEND_ENGINE_2
+#              ifdef HTTP_HAVE_EVENT
+               || SUCCESS != PHP_RINIT_CALL(http_request_pool)
+#              endif
                || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
 #      endif
 #endif
@@ -447,6 +454,11 @@ PHP_MINFO_FUNCTION(http)
 #else
                php_info_print_table_row(2, "libcurl", "disabled", "disabled");
 #endif
+#ifdef HTTP_HAVE_EVENT
+               php_info_print_table_row(3, "libevent", HTTP_EVENT_VERSION, event_get_version());
+#else
+               php_info_print_table_row(3, "libevent", "disabled", "disabled");
+#endif
 #ifdef HTTP_HAVE_ZLIB
                php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
 #else