com php-src: Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes: UPGRADING php.ini-development php.ini-production
| From: | Yasuo Ohgaki | Date: | Mon, 17 Mar 2014 22:28:26 +0000 |
| Subject: | com php-src: Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes: UPGRADING php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76512@lists.php.net to get a copy of this message | ||
Commit: a28389b2ab890058cab541ec92e2d53f4b5faf3f
Author: Yasuo Ohgaki <yohgaki@php.net> Tue, 18 Mar 2014 07:27:45 +0900
Parents: 42562ee913e039ccb24ff11bc5352f0b0e02ee28
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a28389b2ab890058cab541ec92e2d53f4b5faf3f
Log:
Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes
Changed paths:
M UPGRADING
M php.ini-development
M php.ini-production
Diff:
diff --git a/UPGRADING b/UPGRADING
index eaced08..47c463c 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -161,12 +161,12 @@ PHP 5.6 UPGRADE NOTES
- Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT, an
undocument constant effectively equivalent to PDO::ATTR_EMULATE_PREPARES.
-- Deprecated INIs: Following INIs are deprecated in favor of new
+- Deprecated INIs: Following INIs are deprecated in favour of new
internal_encoding/input_encoding/output_encoding. Refer to "Changes to
encodings in PHP 5.6" in "11. Other Changes" section for more details.
iconv.input_encoding
- iconv.ouput_encoding
+ iconv.output_encoding
iconv.internal_encoding
mbstring.http_input
mbstring.http_output
@@ -397,10 +397,10 @@ PHP 5.6 UPGRADE NOTES
output_encoding
The values of the following php.ini parameters have become empty in
- PHP 5.6 (previosuly they were all ISO-8859-1)
+ PHP 5.6 (previously they were all ISO-8859-1)
iconv.input_encoding
- iconv.ouput_encoding
+ iconv.output_encoding
iconv.internal_encoding
Changes were made to character set handling in:
@@ -417,7 +417,7 @@ PHP 5.6 UPGRADE NOTES
empty:
iconv.input_encoding
- iconv.ouput_encoding
+ iconv.output_encoding
iconv.internal_encoding
mbstring.http_input
mbstring.http_output
diff --git a/php.ini-development b/php.ini-development
index c5196b4..ac60db9 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -950,15 +950,20 @@ cli_server.color = On
[iconv]
; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, input_encoding is used.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
;iconv.input_encoding =
; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, internal_encoding is used.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
;iconv.internal_encoding =
; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv..output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
;iconv.output_encoding =
[intl]
@@ -1729,21 +1734,25 @@ mssql.secure_connection = Off
; Use of this INI entry is deprecated, use global internal_encoding instead.
; internal/script encoding.
; 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
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
;mbstring.internal_encoding =
; Use of this INI entry 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.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
; http://php.net/mbstring.http-input
;mbstring.http_input =
; Use of this INI entry 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.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
; http://php.net/mbstring.http-output
;mbstring.http_output =
diff --git a/php.ini-production b/php.ini-production
index 38c7415..c5853ca 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -948,15 +948,20 @@ cli_server.color = On
[iconv]
; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, input_encoding is used.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
;iconv.input_encoding =
; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, internal_encoding is used.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used..
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
;iconv.internal_encoding =
; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or iconv..output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
;iconv.output_encoding =
[intl]
@@ -1727,21 +1732,25 @@ mssql.secure_connection = Off
; Use of this INI entry is deprecated, use global internal_encoding instead.
; internal/script encoding.
; 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
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
;mbstring.internal_encoding =
; Use of this INI entry 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.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
; http://php.net/mbstring.http-input
;mbstring.http_input =
; Use of this INI entry 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.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
; http://php.net/mbstring.http-output
;mbstring.http_output =