Commit: 2bad01e61ba2677e1e8303f9b56574ebb7ba3f00 Author: Stanislav Malyshev <s...@php.net> Sun, 14 Jul 2013 23:53:55 -0700 Parents: a51b50000d5f349aa52abed3100848f658f1995c Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bad01e61ba2677e1e8303f9b56574ebb7ba3f00 Log: Fix bug #62665: add curl.cainfo to php.ini Conflicts: php.ini-development php.ini-production Bugs: https://bugs.php.net/62665 Changed paths: M NEWS M php.ini-development M php.ini-production Diff: diff --git a/NEWS b/NEWS index 2ff1675..52eab40 100644 --- a/NEWS +++ b/NEWS @@ -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 4ff4192..aee8b48 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 814455b..2df1264 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: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
