H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-18 12:24:40 +00:00
Code Releases Activity

Merge branch 'jx/http-no-proxy'

Browse Source 
* jx/http-no-proxy:
  http: honor no_http env variable to bypass proxy
This commit is contained in:
Junio C Hamano 2016-03-10 10:56:43 -08:00
commit f4a48e8708
1 changed files with 6 additions and 0 deletions

6
http.c

@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv;
static const char *curl_http_proxy;
static const char *curl_no_proxy;
static const char *http_proxy_authmethod;
static struct {
const char *name;
@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
}
curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
#if LIBCURL_VERSION_NUM >= 0x071304
var_override(&curl_no_proxy, getenv("NO_PROXY"));
var_override(&curl_no_proxy, getenv("no_proxy"));
curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
#endif
}
init_curl_proxy_auth(result);