From: Jay Satiro <raysatiro@yahoo.com>
Date: Thu, 23 Feb 2017 22:06:11 +0000 (-0500)
Subject: url: Default the CA proxy bundle location to CURL_CA_BUNDLE
X-Git-Tag: curl-7_53_1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93cce2489db9289e17a4daaa58483d7bd94afffe;p=thirdparty%2Fcurl.git

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
---

diff --git a/lib/url.c b/lib/url.c
index a78a2412f8..38b9552f7a 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);