New upstream version 5.6.0~beta1+dfsgupstream/5.6.0_beta1+dfsg

1 files changed, 40 insertions, 13 deletions

diff --git a/php.ini-production b/php.ini-production
index fcd96bfad..c5853ca56 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -947,16 +947,21 @@ cli_server.color = On
 ;filter.default_flags =
 
 [iconv]
-; Use of this INI entory is deprecated, use global input_encoding instead.
-; If empty, input_encoding is used.
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; 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 entory is deprecated, use global internal_encoding instead.
-; If empty, internal_encoding is used.
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; 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 entory is deprecated, use global output_encoding instead.
-; If empty, output_encoding is used.
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; 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]
@@ -1724,24 +1729,28 @@ mssql.secure_connection = Off
 ; http://php.net/mbstring.language
 ;mbstring.language = Japanese
 
-; Use of this INI entory is deprecated, use global internal_encoding instead.
+; 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 entory is deprecated, use global input_encoding instead.
+; 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 entory is deprecated, use global output_encoding instead.
+; 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 =
 
@@ -1965,6 +1974,24 @@ ldap.max_links = -1
 ; absolute path.
 ;curl.cainfo =
 
+[openssl]
+; The location of a Certificate Authority (CA) file on the local filesystem
+; to use when verifying the identity of SSL/TLS peers. Most users should
+; not specify a value for this directive as PHP will attempt to use the
+; OS-managed cert stores in its absence. If specified, this value may still
+; be overridden on a per-stream basis via the "cafile" SSL stream context
+; option.
+;openssl.cafile=
+
+; If openssl.cafile is not specified or if the CA file is not found, the
+; directory pointed to by openssl.capath is searched for a suitable
+; certificate. This value must be a correctly hashed certificate directory.
+; Most users should not specify a value for this directive as PHP will
+; attempt to use the OS-managed cert stores in its absence. If specified,
+; this value may still be overridden on a per-stream basis via the "capath"
+; SSL stream context option.
+;openssl.capath=
+
 ; Local Variables:
 ; tab-width: 4
 ; End: