X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=74d92b227d480b730d5102cc9e6e6293904668eb;hp=0299d2f920d904d7422898353d219e32d59bacef;hb=c5f93282d7885a6c5f80863cbee2ab55a3176851;hpb=85f5451a3e9fad7cb9728ba5408b433fca22b44b

diff --git a/http.c b/http.c
index 0299d2f..74d92b2 100644
--- 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
@@ -160,7 +164,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	PHP_EXT_HTTP_VERSION,
+	PHP_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -201,13 +205,15 @@ static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
 	}
 }
 
-#if PHP_DEBUG
+#if defined(ZTS) && defined(PHP_DEBUG)
+#if ZTS && PHP_DEBUG
 zend_http_globals *http_globals(void)
 {
 	TSRMLS_FETCH();
 	return HTTP_G;
 }
 #endif
+#endif
 /* }}} */
 
 /* {{{ static inline void http_check_allowed_methods(char *) */
@@ -361,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
@@ -402,8 +411,8 @@ PHP_MINFO_FUNCTION(http)
 {
 	php_info_print_table_start();
 	{
-		php_info_print_table_row(2, "HTTP Support", "enabled");
-		php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
+		php_info_print_table_header(2, "HTTP Support", "enabled");
+		php_info_print_table_row(2, "Extension Version", PHP_HTTP_VERSION);
 		php_info_print_table_row(2, "Registered Classes",
 #ifndef ZEND_ENGINE_2
 			"none"
@@ -445,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