Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ws/curl-http-proxy-over-https'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000
(14:08 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000
(14:08 -0800)
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
http.c
patch
|
blob
|
history
raw
(from parent 1:
f53edaf
)
diff --git
a/http.c
b/http.c
index 215bebef1bfb935355a765027fc8605fccbc3d1b..32d33261c98cce2d5fd25c07a503654a3d5d2e52 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-865,6
+865,11
@@
static CURL *get_curl_handle(void)
else if (starts_with(curl_http_proxy, "socks"))
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);