From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 25 Oct 2002 08:51:59 +0000 (+0000)
Subject: Added two new rows to MINFO that describes iconv library info.
X-Git-Tag: php-4.3.0pre2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34aa59baf9bbd29caf5e5e0d668f7df0e3df45a7;p=php

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

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 12e3eb2910..9175eb49c7 100644
--- 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