diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:53:55 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:56:03 -0700 |
| commit | 2bad01e61ba2677e1e8303f9b56574ebb7ba3f00 (patch) | |
| tree | d679b648a64bbbcb1bec07baa1fa875add85b5c0 | |
| parent | a51b50000d5f349aa52abed3100848f658f1995c (diff) | |
| download | php-git-2bad01e61ba2677e1e8303f9b56574ebb7ba3f00.tar.gz | |
Fix bug #62665: add curl.cainfo to php.ini
Conflicts:
php.ini-development
php.ini-production
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | php.ini-development | 5 | ||||
| -rw-r--r-- | php.ini-production | 5 |
3 files changed, 14 insertions, 1 deletions
@@ -24,6 +24,9 @@ PHP NEWS . Fixed bug #65066 (Cli server not responsive when responding with 422 http status code). (Adam) +- CURL: + . Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan) + - FPM: . Fixed bug #63983 (enabling FPM borks compile on FreeBSD). (chibisuke at web dot de, Felipe) @@ -55,7 +58,7 @@ PHP NEWS . Allowed PDO_OCI to compile with Oracle Database 12c client libraries. (Chris Jones) --PDO_dblib: +- PDO_dblib: . Fixed bug #65219 (PDO/dblib not working anymore ("use dbName" not sent)). (Stanley Sufficool) diff --git a/php.ini-development b/php.ini-development index 4ff4192f6f..aee8b4837a 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1856,6 +1856,11 @@ ldap.max_links = -1 [dba] ;dba.default_handler= +[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 814455bbbb..2df1264adf 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1856,6 +1856,11 @@ ldap.max_links = -1 [dba] ;dba.default_handler= +[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: |