- improve libmagic support

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 72c7c2a532dd022be5cb7429dce34afd71c6a921..8d65cd155ea50d3a7f0803eb5f8acedbd08a502c 100644 (file)
--- a/http.c
+++ b/http.c
@@ -332,9 +332,19 @@ PHP_MINFO_FUNCTION(http)
                php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
 #endif
 #ifdef HTTP_HAVE_MHASH
-               php_info_print_table_row(2, "mhash ETag Generator:", MHASH_API_VERSION);
+               {
+                       char mhash_info[32];
+                       
+                       snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION);
+                       php_info_print_table_row(2, "mhash ETag Generator:", mhash_info);
+               }
 #else
                php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
+#endif
+#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+               php_info_print_table_row(2, "magic MIME Guessing:", "libmagic/unknown");
+#else
+               php_info_print_table_row(2, "magic MIME Guessing:", "disabled");
 #endif
                php_info_print_table_row(2, "Registered Classes:",
 #ifndef ZEND_ENGINE_2