From cbd108abf19d9fb9ae1d4ccd153215f56a2763e8 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Thu, 13 Feb 2014 11:54:52 +0900 Subject: Implement RFC https://wiki.php.net/rfc/default_encoding --- php.ini-production | 55 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) (limited to 'php.ini-production') diff --git a/php.ini-production b/php.ini-production index 3b6f5e3cf8..fcd96bfad9 100644 --- a/php.ini-production +++ b/php.ini-production @@ -680,7 +680,22 @@ default_mimetype = "text/html" ; PHP's default character set is set to empty. ; http://php.net/default-charset -;default_charset = "UTF-8" +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; http://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; mbstring or iconv output handler is used. +; See also output_buffer. +; http://php.net/output-encoding +;output_encoding = ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is ; to disable this feature and it will be removed in a future version. @@ -932,9 +947,17 @@ cli_server.color = On ;filter.default_flags = [iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 +; Use of this INI entory is deprecated, use global input_encoding instead. +; If empty, input_encoding is used. +;iconv.input_encoding = + +; Use of this INI entory is deprecated, use global internal_encoding instead. +; If empty, internal_encoding is used. +;iconv.internal_encoding = + +; Use of this INI entory is deprecated, use global output_encoding instead. +; If empty, output_encoding is used. +;iconv.output_encoding = [intl] ;intl.default_locale = @@ -1697,23 +1720,30 @@ mssql.secure_connection = Off [mbstring] ; language for internal character representation. +; This affects mb_send_mail() and mbstrig.detect_order. ; http://php.net/mbstring.language ;mbstring.language = Japanese +; Use of this INI entory is deprecated, use global internal_encoding instead. ; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding is used in order. ; http://php.net/mbstring.internal-encoding -;mbstring.internal_encoding = UTF-8 +;mbstring.internal_encoding = +; Use of this INI entory is deprecated, use global input_encoding instead. ; http input encoding. +; If empty, input_encoding is used. +; mbstring.encoding_traslation = On is needed to use this setting. ; http://php.net/mbstring.http-input -;mbstring.http_input = UTF-8 +;mbstring.http_input = -; http output encoding. mb_output_handler must be -; registered as output buffer to function +; Use of this INI entory is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, output_encoding is used. ; http://php.net/mbstring.http-output -;mbstring.http_output = pass +;mbstring.http_output = ; enable automatic encoding translation according to ; mbstring.internal_encoding setting. Input chars are @@ -1724,7 +1754,7 @@ mssql.secure_connection = Off ;mbstring.encoding_translation = Off ; automatic encoding detection order. -; auto means +; "auto" detect order is changed accoding to mbstring.language ; http://php.net/mbstring.detect-order ;mbstring.detect_order = auto @@ -1745,6 +1775,7 @@ mssql.secure_connection = Off ;mbstring.func_overload = 0 ; enable strict encoding detection. +; Default: Off ;mbstring.strict_detection = On ; This directive specifies the regex pattern of content types for which mb_output_handler() -- cgit v1.2.1