From: Michael Wallner <mike@php.net>
Date: Mon, 5 Sep 2005 15:29:45 +0000 (+0000)
Subject: - even simpler MINFO
X-Git-Tag: RELEASE_0_13_0~25
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e8608b78db949f6806ee47709aa6799affe69b9e;p=m6w6%2Fext-http

- even simpler MINFO
---

diff --git a/http.c b/http.c
index 627f5b7..72c7c2a 100644
--- a/http.c
+++ b/http.c
@@ -57,6 +57,9 @@
 #	endif
 #	include <curl/curl.h>
 #endif
+#ifdef HTTP_HAVE_MHASH
+#	include <mhash.h>
+#endif
 
 #include <ctype.h>
 
@@ -319,26 +322,17 @@ PHP_RSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_MINFO_FUNCTION */
 PHP_MINFO_FUNCTION(http)
 {
-#ifdef HTTP_HAVE_CURL
-#	define HTTP_CURL_VERSION curl_version()
-#else
-#	define HTTP_CURL_VERSION "libcurl not available"
-#endif
-
 	php_info_print_table_start();
 	{
-		char full_version_string[1024] = {0};
-		snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
 		php_info_print_table_row(2, "Extended HTTP support:", "enabled");
-		php_info_print_table_row(2, "Extension Version:", full_version_string);
+		php_info_print_table_row(2, "Extension Version:", HTTP_PEXT_VERSION);
 #ifdef HTTP_HAVE_CURL
-		php_info_print_table_row(2, "cURL HTTP Requests:", "enabled");
+		php_info_print_table_row(2, "cURL HTTP Requests:", curl_version());
 #else
 		php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
 #endif
 #ifdef HTTP_HAVE_MHASH
-		php_info_print_table_row(2, "mhash ETag Generator:", "enabled");
+		php_info_print_table_row(2, "mhash ETag Generator:", MHASH_API_VERSION);
 #else
 		php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
 #endif