com php-src: Add openssl.cafile ini check when loading cainfo: ext/curl/interface.c

From: Date: Tue, 25 Feb 2014 16:59:13 +0000
Subject: com php-src: Add openssl.cafile ini check when loading cainfo: ext/curl/interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76210@lists.php.net to get a copy of this message
Commit: a031dc06d9b903705c7dd433d1361ba265ee4dfa Author: Daniel Lowrey <rdlowrey@php.net> Mon, 24 Feb 2014 13:55:55 -0700 Parents: 47b5873c5d0263e8e5feb4457df3594ddf3b4eda Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a031dc06d9b903705c7dd433d1361ba265ee4dfa Log: Add openssl.cafile ini check when loading cainfo Changed paths: M ext/curl/interface.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 921929a...a9282ec 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1895,7 +1895,10 @@ static void _php_curl_set_default_options(php_curl *ch) curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120); curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */ - cainfo = INI_STR("curl.cainfo"); + cainfo = INI_STR("openssl.cafile"); + if (!(cainfo && strlen(cainfo) > 0)) { + cainfo = INI_STR("curl.cainfo"); + } if (cainfo && strlen(cainfo) > 0) { curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo); }

« previous php.cvs (#76210) next »