Added two new rows to MINFO that describes iconv library info.

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 12e3eb2910dcf7d7a2e3e1ba7ba8c2b77f4ffcde..9175eb49c7aacbe178e0cc709e5837e4b5252bc3 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -144,11 +144,21 @@ PHP_MSHUTDOWN_FUNCTION(miconv)
 
 PHP_MINFO_FUNCTION(miconv)
 {
+       zval iconv_impl, iconv_ver;
+
+       zend_get_constant("ICONV_IMPL", sizeof("ICONV_IMPL")-1, &iconv_impl);
+       zend_get_constant("ICONV_VERSION", sizeof("ICONV_VERSION")-1, &iconv_ver);
+
        php_info_print_table_start();
-       php_info_print_table_header(2, "iconv support", "enabled");
+       php_info_print_table_row(2, "iconv support", "enabled");
+       php_info_print_table_row(2, "iconv implementation", Z_STRVAL(iconv_impl));
+       php_info_print_table_row(2, "iconv library version", Z_STRVAL(iconv_ver));
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();
+
+       zval_dtor(&iconv_impl);
+       zval_dtor(&iconv_ver);
 }
 #
 #define PHP_ICONV_CONVERTER                    1