From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 18:56:43 +0000 (-0800)
Subject: Merge branch 'jx/http-no-proxy'
X-Git-Tag: v2.8.0-rc2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f4a48e870892b18a7205c9315821e4b6a831ade4?ds=inline;hp=-c

Merge branch 'jx/http-no-proxy'

* jx/http-no-proxy:
http: honor no_http env variable to bypass proxy
---

f4a48e870892b18a7205c9315821e4b6a831ade4
diff --combined http.c
index 1d5e3bbd11,ad3fddf5cc..69da4454d8
--- a/http.c
+++ b/http.c
@@@ -11,11 -11,6 +11,11 @@@
  #include "gettext.h"
  #include "transport.h"
  
 +#if LIBCURL_VERSION_NUM >= 0x070a08
 +long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
 +#else
 +long int git_curl_ipresolve;
 +#endif
  int active_requests;
  int http_is_verbose;
  size_t http_post_buffer = 16 * LARGE_PACKET_MAX;
@@@ -62,14 -57,12 +62,15 @@@ static const char *ssl_key
  #if LIBCURL_VERSION_NUM >= 0x070908
  static const char *ssl_capath;
  #endif
 +#if LIBCURL_VERSION_NUM >= 0x072c00
 +static const char *ssl_pinnedkey;
 +#endif
  static const char *ssl_cainfo;
  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;
@@@ -95,7 -88,6 +96,7 @@@ static int curl_save_cookies
  struct credential http_auth = CREDENTIAL_INIT;
  static int http_proactive_auth;
  static const char *user_agent;
 +static int curl_empty_auth;
  
  #if LIBCURL_VERSION_NUM >= 0x071700
  /* Use CURLOPT_KEYPASSWD as is */
@@@ -308,31 -300,14 +309,31 @@@ static int http_options(const char *var
  	if (!strcmp("http.useragent", var))
  		return git_config_string(&user_agent, var, value);
  
 +	if (!strcmp("http.emptyauth", var)) {
 +		curl_empty_auth = git_config_bool(var, value);
 +		return 0;
 +	}
 +
 +	if (!strcmp("http.pinnedpubkey", var)) {
 +#if LIBCURL_VERSION_NUM >= 0x072c00
 +		return git_config_pathname(&ssl_pinnedkey, var, value);
 +#else
 +		warning(_("Public key pinning not supported with cURL < 7.44.0"));
 +		return 0;
 +#endif
 +	}
 +
  	/* Fall back on the default ones */
  	return git_default_config(var, value, cb);
  }
  
  static void init_curl_http_auth(CURL *result)
  {
 -	if (!http_auth.username)
 +	if (!http_auth.username) {
 +		if (curl_empty_auth)
 +			curl_easy_setopt(result, CURLOPT_USERPWD, ":");
  		return;
 +	}
  
  	credential_fill(&http_auth);
  
@@@ -524,10 -499,6 +525,10 @@@ static CURL *get_curl_handle(void
  #if LIBCURL_VERSION_NUM >= 0x070908
  	if (ssl_capath != NULL)
  		curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
 +#endif
 +#if LIBCURL_VERSION_NUM >= 0x072c00
 +	if (ssl_pinnedkey != NULL)
 +		curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
  #endif
  	if (ssl_cainfo != NULL)
  		curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
@@@ -624,6 -595,11 +625,11 @@@
  		}
  
  		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);
  
@@@ -854,14 -830,10 +860,14 @@@ struct active_request_slot *get_active_
  	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
  	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1);
  	curl_easy_setopt(slot->curl, CURLOPT_RANGE, NULL);
 +
 +#if LIBCURL_VERSION_NUM >= 0x070a08
 +	curl_easy_setopt(slot->curl, CURLOPT_IPRESOLVE, git_curl_ipresolve);
 +#endif
  #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
  	curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, http_auth_methods);
  #endif
 -	if (http_auth.password)
 +	if (http_auth.password || curl_empty_auth)
  		init_curl_http_auth(slot->curl);
  
  	return slot;