From b04812609b3f2c4e6c9aa9697700feea95f88449 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Mon, 18 Dec 2006 20:47:57 +0000 Subject: [PATCH] Unicode support in get_cfg_var(). --- ext/standard/basic_functions.c | 6 +++--- unicode-progress.txt | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 140ddf3865..bbc7b30725 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4807,7 +4807,7 @@ PHP_FUNCTION(get_current_user) } /* }}} */ -/* {{{ proto string get_cfg_var(string option_name) +/* {{{ proto string get_cfg_var(string option_name) U Get the value of a PHP configuration option */ PHP_FUNCTION(get_cfg_var) { @@ -4815,14 +4815,14 @@ PHP_FUNCTION(get_cfg_var) int varname_len; char *value; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &varname, &varname_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &varname, &varname_len, UG(utf8_conv)) == FAILURE) { return; } if (cfg_get_string(varname, &value) == FAILURE) { RETURN_FALSE; } - RETURN_STRING(value, 1); + RETURN_UTF8_STRING(value, ZSTR_DUPLICATE); } /* }}} */ diff --git a/unicode-progress.txt b/unicode-progress.txt index ec3907db63..525abb35ed 100644 --- a/unicode-progress.txt +++ b/unicode-progress.txt @@ -14,12 +14,6 @@ ext/standard set_include_path(), get_include_path(), restore_include_path() Params API, depends on INI mechanism - get_cfg_var() - IS_UNICODE support for varname - - parse_ini_file() - Params API, unicode filename support, depends on INI mechaniem - array.c ------- natsort(), natcasesort() -- 2.50.1