Correct carset if iconv is active

#Same solution would work for mbstring - but that must wait

diff --git a/ext/standard/info.c b/ext/standard/info.c
index ee22c9c9585f0ca47d07068c46652b999b01494a..ebbb79394cf4a2835931ec5b4a94f9758a4520e5 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -38,6 +38,14 @@
 #include <sys/utsname.h>
 #endif
 
+#ifdef PHP_ATOM_INC
+#include "php_have_iconv.h"
+#endif
+#if HAVE_ICONV
+#include "ext/iconv/php_iconv.h"
+ZEND_EXTERN_MODULE_GLOBALS(iconv)
+#endif
+
 #define SECTION(name)  PUTS("<h2 align=\"center\">" name "</h2>\n")
 
 PHPAPI extern char *php_ini_opened_path;
@@ -203,12 +211,13 @@ PHPAPI char *php_get_uname(char mode)
  */
 PHPAPI void php_print_info(int flag TSRMLS_DC)
 {
-       char **env, *tmp1, *tmp2, *charset = NULL;
+       char **env, *tmp1, *tmp2;
+       const char *charset = NULL;
        char *php_uname;
        int expose_php = INI_INT("expose_php");
        time_t the_time;
        struct tm *ta, tmbuf;
-       
+
 
        the_time = time(NULL);
        ta = php_localtime_r(&the_time, &tmbuf);
@@ -219,6 +228,11 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
        if (SG(default_charset)) {
                charset = SG(default_charset);
        }
+#if HAVE_ICONV
+       if (php_ob_handler_used("ob_iconv_handler" TSRMLS_CC)) {
+               charset = ICONVG(output_encoding);
+       }
+#endif
        if (!charset || !charset[0]) {
                charset = "US-ASCII";
        }