diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-03 23:24:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-03 23:24:53 +0800 |
| commit | ef1505821b3eeb7500898e29e652525f1a52d2a7 (patch) | |
| tree | 556dc854c2c4cc1b064c384f0fe0331e29ddcb18 | |
| parent | 67207166827b2c91e82e0cacab568f62c70ceef0 (diff) | |
| parent | 1bb7647c6e24ec6262ee2149de6df1648ce30614 (diff) | |
| download | php-git-ef1505821b3eeb7500898e29e652525f1a52d2a7.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | main/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index f2b3f392d6..d5d101ae55 100644 --- a/main/main.c +++ b/main/main.c @@ -556,7 +556,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_append_file, php_core_globals, core_globals) STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_prepend_file, php_core_globals, core_globals) STD_PHP_INI_ENTRY("doc_root", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, doc_root, php_core_globals, core_globals) -STD_PHP_INI_ENTRY("default_charset", PHP_DEFAULT_CHARSET, PHP_INI_ALL, OnUpdateString, default_charset, sapi_globals_struct, sapi_globals) + STD_PHP_INI_ENTRY("default_charset", PHP_DEFAULT_CHARSET, PHP_INI_ALL, OnUpdateString, default_charset, sapi_globals_struct, sapi_globals) STD_PHP_INI_ENTRY("default_mimetype", SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL, OnUpdateString, default_mimetype, sapi_globals_struct, sapi_globals) STD_PHP_INI_ENTRY("internal_encoding", NULL, PHP_INI_ALL, OnUpdateInternalEncoding, internal_encoding, php_core_globals, core_globals) STD_PHP_INI_ENTRY("input_encoding", NULL, PHP_INI_ALL, OnUpdateInputEncoding, input_encoding, php_core_globals, core_globals) |