diff options
author | Wei Shuyu <wsy@dogben.com> | 2017-12-20 01:24:01 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 10:20:14 -0800 |
commit | 82b6803aeec62489977b98804b0a18396d3c6ebf (patch) | |
tree | 7651795b904fa2e1ea2f38fc50f6d4cdf378f5cf | |
parent | Prepare for 2.15.2 (diff) | |
download | tgif-82b6803aeec62489977b98804b0a18396d3c6ebf.tar.xz |
http: support CURLPROXY_HTTPS
HTTP proxy over SSL is supported by curl since 7.52.0.
This is very useful for networks with protocol whitelist.
Signed-off-by: Wei Shuyu <wsy@dogben.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | http.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -865,6 +865,11 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4); #endif +#if LIBCURL_VERSION_NUM >= 0x073400 + else if (starts_with(curl_http_proxy, "https")) + curl_easy_setopt(result, + CURLOPT_PROXYTYPE, CURLPROXY_HTTPS); +#endif if (strstr(curl_http_proxy, "://")) credential_from_url(&proxy_auth, curl_http_proxy); else { |