]> granicus.if.org Git - curl/commitdiff
url: Default the CA proxy bundle location to CURL_CA_BUNDLE
authorJay Satiro <raysatiro@yahoo.com>
Thu, 23 Feb 2017 22:06:11 +0000 (17:06 -0500)
committerJay Satiro <raysatiro@yahoo.com>
Thu, 23 Feb 2017 22:06:11 +0000 (17:06 -0500)
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

lib/url.c

index a78a2412f8e484b2f04bb0ae3532b16e4fdbaa3b..38b9552f7a9de03c06652f1188a9516c2412bda8 100644 (file)
--- 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);