From b1dc4792f5abc0b42c72b9a5d579abe3246cb4d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Mar 2014 14:35:08 +0100 Subject: php-5.6.0-0.4.201403261230 (test build) --- php.ini | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'php.ini') diff --git a/php.ini b/php.ini index bc53066..ec66ee5 100644 --- a/php.ini +++ b/php.ini @@ -908,15 +908,15 @@ cli_server.color = On ;filter.default_flags = [iconv] -; Use of this INI entory is deprecated, use global input_encoding instead. +; Use of this INI entry 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. +; Use of this INI entry 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. +; Use of this INI entry is deprecated, use global output_encoding instead. ; If empty, output_encoding is used. ;iconv.output_encoding = @@ -1654,21 +1654,21 @@ 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 ;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. ; 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. @@ -1803,6 +1803,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: -- cgit