From: Marcus Boerger <helly@php.net>
Date: Mon, 5 Aug 2002 19:00:09 +0000 (+0000)
Subject: Correct carset if iconv is active
X-Git-Tag: dev~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55f735a587b4be26420ac369b8dd8fd6453f7f93;p=php

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 ee22c9c958..ebbb79394c 100644
--- 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";
 	}