diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-29 01:08:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-29 01:08:50 +0300 |
commit | fc4a226bf60be67bc3d574aeafe06d266f700d99 (patch) | |
tree | b3c5bbc0c737d86604e4bb8ea6fb4d1b9f88a025 | |
parent | f53edaf2d5983f82ffb513e10569bbfbe540613d (diff) | |
parent | 82b6803aeec62489977b98804b0a18396d3c6ebf (diff) |
Merge branch 'ws/curl-http-proxy-over-https'
Git has been taught to support an https:// URL used for http.proxy
when using recent versions of libcurl.
* ws/curl-http-proxy-over-https:
http: support CURLPROXY_HTTPS
-rw-r--r-- | http.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -866,6 +866,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 { |