From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Mar 2017 20:56:42 +0000 (-0700)
Subject: Merge branch 'jt/http-base-url-update-upon-redirect' into maint
X-Git-Tag: v2.12.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68e12d7d97e1c1a853ac4c603b06afa051cf1276?ds=inline;hp=-c

Merge branch 'jt/http-base-url-update-upon-redirect' into maint

When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.

* jt/http-base-url-update-upon-redirect:
http: attempt updating base URL only if no error
---

68e12d7d97e1c1a853ac4c603b06afa051cf1276
diff --combined http.c
index d2d6899b99,1df186894d..96d84bbed3
--- a/http.c
+++ b/http.c
@@@ -109,7 -109,7 +109,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;
 +static int curl_empty_auth = -1;
  
  enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL;
  
@@@ -125,14 -125,6 +125,14 @@@ static struct credential cert_auth = CR
  static int ssl_cert_password_required;
  #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
  static unsigned long http_auth_methods = CURLAUTH_ANY;
 +static int http_auth_methods_restricted;
 +/* Modes for which empty_auth cannot actually help us. */
 +static unsigned long empty_auth_useless =
 +	CURLAUTH_BASIC
 +#ifdef CURLAUTH_DIGEST_IE
 +	| CURLAUTH_DIGEST_IE
 +#endif
 +	| CURLAUTH_DIGEST;
  #endif
  
  static struct curl_slist *pragma_header;
@@@ -341,10 -333,7 +341,10 @@@ static int http_options(const char *var
  		return git_config_string(&user_agent, var, value);
  
  	if (!strcmp("http.emptyauth", var)) {
 -		curl_empty_auth = git_config_bool(var, value);
 +		if (value && !strcmp("auto", value))
 +			curl_empty_auth = -1;
 +		else
 +			curl_empty_auth = git_config_bool(var, value);
  		return 0;
  	}
  
@@@ -393,37 -382,10 +393,37 @@@
  	return git_default_config(var, value, cb);
  }
  
 +static int curl_empty_auth_enabled(void)
 +{
 +	if (curl_empty_auth >= 0)
 +		return curl_empty_auth;
 +
 +#ifndef LIBCURL_CAN_HANDLE_AUTH_ANY
 +	/*
 +	 * Our libcurl is too old to do AUTH_ANY in the first place;
 +	 * just default to turning the feature off.
 +	 */
 +#else
 +	/*
 +	 * In the automatic case, kick in the empty-auth
 +	 * hack as long as we would potentially try some
 +	 * method more exotic than "Basic" or "Digest".
 +	 *
 +	 * But only do this when this is our second or
 +	 * subsequent request, as by then we know what
 +	 * methods are available.
 +	 */
 +	if (http_auth_methods_restricted &&
 +	    (http_auth_methods & ~empty_auth_useless))
 +		return 1;
 +#endif
 +	return 0;
 +}
 +
  static void init_curl_http_auth(CURL *result)
  {
  	if (!http_auth.username || !*http_auth.username) {
 -		if (curl_empty_auth)
 +		if (curl_empty_auth_enabled())
  			curl_easy_setopt(result, CURLOPT_USERPWD, ":");
  		return;
  	}
@@@ -1117,7 -1079,7 +1117,7 @@@ struct active_request_slot *get_active_
  #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
  	curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, http_auth_methods);
  #endif
 -	if (http_auth.password || curl_empty_auth)
 +	if (http_auth.password || curl_empty_auth_enabled())
  		init_curl_http_auth(slot->curl);
  
  	return slot;
@@@ -1385,10 -1347,6 +1385,10 @@@ static int handle_curl_result(struct sl
  		} else {
  #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
  			http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
 +			if (results->auth_avail) {
 +				http_auth_methods &= results->auth_avail;
 +				http_auth_methods_restricted = 1;
 +			}
  #endif
  			return HTTP_REAUTH;
  		}
@@@ -1769,6 -1727,9 +1769,9 @@@ static int http_request_reauth(const ch
  {
  	int ret = http_request(url, result, target, options);
  
+ 	if (ret != HTTP_OK && ret != HTTP_REAUTH)
+ 		return ret;
+ 
  	if (options && options->effective_url && options->base_url) {
  		if (update_url_from_redirect(options->base_url,
  					     url, options->effective_url)) {