com php-src: Update php.ini files (new openssl directives): php.ini-development php.ini-production

Commit: ff3c6931c0b3c275127ec8a73ad82fa2f9ff527c Author: Daniel Lowrey <rdlowrey@php.net> Fri, 7 Mar 2014 05:26:37 -0700 Parents: 8d3f4b647b0942273f477e5b7e1f3d5d26dc4e0d Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff3c6931c0b3c275127ec8a73ad82fa2f9ff527c Log: Update php.ini files (new openssl directives) Changed paths: M php.ini-development M php.ini-production Diff: diff --git a/php.ini-development b/php.ini-development index 50fbba1..8d2c669 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1967,6 +1967,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: diff --git a/php.ini-production b/php.ini-production index fcd96bf..602208a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1965,6 +1965,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: