From fa175d6fa210c7c0e3000aff0253b1ab0e18c70b Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 4 Aug 2002 22:49:48 +0000 Subject: -Send charset US-ASCII or ini setting default_charset. #After some discussion with Ilia Alshanetsky #But perhaps we should have a look for a mbstring solution... --- ext/standard/info.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ext/standard') diff --git a/ext/standard/info.c b/ext/standard/info.c index 5d90afc43e..ee22c9c958 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -203,7 +203,7 @@ PHPAPI char *php_get_uname(char mode) */ PHPAPI void php_print_info(int flag TSRMLS_DC) { - char **env, *tmp1, *tmp2; + char **env, *tmp1, *tmp2, *charset = NULL; char *php_uname; int expose_php = INI_INT("expose_php"); time_t the_time; @@ -216,7 +216,13 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) PUTS("\n\n"); PUTS(""); php_info_print_style(); - PUTS("phpinfo()"); + if (SG(default_charset)) { + charset = SG(default_charset); + } + if (!charset || !charset[0]) { + charset = "US-ASCII"; + } + php_printf("phpinfo()", charset); if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); -- cgit v1.2.1