summaryrefslogtreecommitdiff
path: root/php.ini-production
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2014-03-07 05:26:48 -0700
committerDaniel Lowrey <rdlowrey@php.net>2014-03-07 05:26:48 -0700
commitddd855cbc2d126e5ef8ecba0103b97e23d53128f (patch)
treead188106ec80bbd2b02075075112afa55504e5f5 /php.ini-production
parent777831a24b1259563048721a4ec023a0d4e1531f (diff)
parentff3c6931c0b3c275127ec8a73ad82fa2f9ff527c (diff)
downloadphp-git-ddd855cbc2d126e5ef8ecba0103b97e23d53128f.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Update php.ini files (new openssl directives)
Diffstat (limited to 'php.ini-production')
-rw-r--r--php.ini-production18
1 files changed, 18 insertions, 0 deletions
diff --git a/php.ini-production b/php.ini-production
index 4a8f0e4e77..3955575b35 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1958,6 +1958,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: