diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:56:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:56:59 -0700 |
| commit | 8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec (patch) | |
| tree | 62482a43997b9f3e34155c67d6540d6fb6432db6 | |
| parent | 07ab23655a993fa8810def7ac9a5097058e1770f (diff) | |
| parent | 2bad01e61ba2677e1e8303f9b56574ebb7ba3f00 (diff) | |
| download | php-git-8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62665: add curl.cainfo to php.ini
Conflicts:
php.ini-development
php.ini-production
| -rw-r--r-- | php.ini-development | 5 | ||||
| -rw-r--r-- | php.ini-production | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development index b23321a9db..b7f0b30359 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1956,6 +1956,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: diff --git a/php.ini-production b/php.ini-production index 8d1f359da4..8b14386c1f 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1956,6 +1956,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: |