moriyoshi               Fri Oct 25 04:52:00 2002 EDT

  Modified files:              
    /php4/ext/iconv     iconv.c 
  Log:
  Added two new rows to MINFO that describes iconv library info.
  
  
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.53 php4/ext/iconv/iconv.c:1.54
--- php4/ext/iconv/iconv.c:1.53 Fri Oct 11 13:48:39 2002
+++ php4/ext/iconv/iconv.c      Fri Oct 25 04:51:59 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: iconv.c,v 1.53 2002/10/11 17:48:39 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.54 2002/10/25 08:51:59 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -144,11 +144,21 @@
 
 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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to