summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-07-14 23:57:16 -0700
committerStanislav Malyshev <stas@php.net>2013-07-14 23:57:16 -0700
commit2c8a4af892151f9991345e57d67f27b19b9ff6ef (patch)
tree63a0602279ae7cd116bb7ab3dbe2d7fd84af8fc9 /php.ini-development
parent50f15bb9219422a0a7e4d86cc03e5d10ed330d85 (diff)
parent8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec (diff)
downloadphp-git-2c8a4af892151f9991345e57d67f27b19b9ff6ef.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Fix bug #62665: add curl.cainfo to php.ini
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development5
1 files changed, 5 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development
index 149dec5505..8e866c662f 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1958,6 +1958,11 @@ ldap.max_links = -1
; Useful for internal debugging only.
;opcache.protect_memory=0
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
; Local Variables:
; tab-width: 4
; End: