summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2017-02-23 17:06:11 -0500
committerJay Satiro <raysatiro@yahoo.com>2017-02-23 17:06:11 -0500
commit93cce2489db9289e17a4daaa58483d7bd94afffe (patch)
treedc910250c30d2a603c7f1840b88981f352781a23
parent53ab183c1a530391b6012e0171600bc69ec58170 (diff)
downloadgnurl-93cce2489db9289e17a4daaa58483d7bd94afffe.tar.gz
gnurl-93cce2489db9289e17a4daaa58483d7bd94afffe.tar.bz2
gnurl-93cce2489db9289e17a4daaa58483d7bd94afffe.zip
url: Default the CA proxy bundle location to CURL_CA_BUNDLE
If the compile-time CURL_CA_BUNDLE location is defined use it as the default value for the proxy CA bundle location, which is the same as what we already do for the regular CA bundle location. Ref: https://github.com/curl/curl/pull/1257
-rw-r--r--lib/url.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/url.c b/lib/url.c
index a78a2412f..38b9552f7 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -577,6 +577,10 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], CURL_CA_BUNDLE);
if(result)
return result;
+
+ result = setstropt(&set->str[STRING_SSL_CAFILE_PROXY], CURL_CA_BUNDLE);
+ if(result)
+ return result;
#endif
#if defined(CURL_CA_PATH)
result = setstropt(&set->str[STRING_SSL_CAPATH_ORIG], CURL_CA_PATH);