Unicode support in get_cfg_var().

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 140ddf386566c8e89f003c4c9e7d749b00179fc6..bbc7b307254b9410fff08393cb277a453919fe07 100644 (file)
--- 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 ec3907db6309253482b0fbb5876768a16ea6449d..525abb35ed0c56cd45bf7573311edfd89cc03bdf 100644 (file)
--- 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()