summaryrefslogtreecommitdiffstats
path: root/lib/url.h
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2020-06-23 21:41:50 (GMT)
committerBrad King <brad.king@kitware.com>2020-06-24 11:55:09 (GMT)
commit5717fdc114a704cddae629e20e6588191360e98a (patch)
tree36545299412c5cafb4d3e3eb464598af465ea4c8 /lib/url.h
parent735ea3001ae98636a4cb7caf15a40960c0da39a1 (diff)
downloadCMake-5717fdc114a704cddae629e20e6588191360e98a.zip
CMake-5717fdc114a704cddae629e20e6588191360e98a.tar.gz
CMake-5717fdc114a704cddae629e20e6588191360e98a.tar.bz2
curl 2020-06-23 (e9db32a0)
Code extracted from: https://github.com/curl/curl.git at commit e9db32a09af03f27e86d1251a9e68e9b7486d371 (curl-7_71_0).
Diffstat (limited to 'lib/url.h')
-rw-r--r--lib/url.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/url.h b/lib/url.h
index 5000c51..1941dc6 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -47,7 +47,7 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn);
CURLcode Curl_open(struct Curl_easy **curl);
CURLcode Curl_init_userdefined(struct Curl_easy *data);
-void Curl_freeset(struct Curl_easy * data);
+void Curl_freeset(struct Curl_easy *data);
CURLcode Curl_uc_to_curlcode(CURLUcode uc);
CURLcode Curl_close(struct Curl_easy **datap); /* opposite of curl_open() */
CURLcode Curl_connect(struct Curl_easy *, bool *async, bool *protocol_connect);
@@ -77,6 +77,10 @@ void Curl_free_idnconverted_hostname(struct hostname *host);
void Curl_verboseconnect(struct connectdata *conn);
#endif
+#ifdef CURL_DISABLE_PROXY
+#define CONNECT_PROXY_SSL() FALSE
+#else
+
#define CONNECT_PROXY_SSL()\
(conn->http_proxy.proxytype == CURLPROXY_HTTPS &&\
!conn->bits.proxy_ssl_connected[sockindex])
@@ -88,5 +92,6 @@ void Curl_verboseconnect(struct connectdata *conn);
#define CONNECT_SECONDARYSOCKET_PROXY_SSL()\
(conn->http_proxy.proxytype == CURLPROXY_HTTPS &&\
!conn->bits.proxy_ssl_connected[SECONDARYSOCKET])
+#endif /* !CURL_DISABLE_PROXY */
#endif /* HEADER_CURL_URL_H */