X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b0b04d8f82e047085f1915fdb309745b8501f2e5;hp=f6b21189a48136400cdedb1e2c685af1e9559504;hb=f05241af52786a2164a2a298492b80b270d9c596;hpb=fa184d3b9f22921108a64c8062f07e3b8bb01e72

diff --git a/http.c b/http.c
index f6b2118..b0b04d8 100644
--- a/http.c
+++ b/http.c
@@ -164,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
 };
 /* }}} */
@@ -411,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"
@@ -454,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
@@ -482,9 +487,11 @@ PHP_MINFO_FUNCTION(http)
 					FOREACH_KEYVAL(pos2, *val, ident, sub) {
 						if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) &&
 								SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) {
-							convert_to_string(*zused);
-							convert_to_string(*zfree);
-							php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_PP(zused), Z_STRVAL_PP(zfree));
+							zval *used = http_zsep(IS_STRING, *zused);
+							zval *free = http_zsep(IS_STRING, *zfree);
+							php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free));
+							zval_ptr_dtor(&used);
+							zval_ptr_dtor(&free);
 						} else {
 							php_info_print_table_row(4, provider.str, ident.str, "0", "0");
 						}