From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Apr 2020 05:05:56 +0000 (-0700)
Subject: Sync with 2.26.2
X-Git-Tag: v2.27.0-rc0~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=048abe1751e6727bfbacf7b80466d78e04631f94;p=thirdparty%2Fgit.git

Sync with 2.26.2
---

048abe1751e6727bfbacf7b80466d78e04631f94
diff --cc http.c
index 4283be9479,5f71263482..62aa995245
--- a/http.c
+++ b/http.c
@@@ -586,21 -566,6 +587,22 @@@ static int has_cert_password(void
  	return 1;
  }
  
 +#if LIBCURL_VERSION_NUM >= 0x073400
 +static int has_proxy_cert_password(void)
 +{
 +	if (http_proxy_ssl_cert == NULL || proxy_ssl_cert_password_required != 1)
 +		return 0;
 +	if (!proxy_cert_auth.password) {
 +		proxy_cert_auth.protocol = xstrdup("cert");
++		proxy_cert_auth.host = xstrdup("");
 +		proxy_cert_auth.username = xstrdup("");
 +		proxy_cert_auth.path = xstrdup(http_proxy_ssl_cert);
 +		credential_fill(&proxy_cert_auth);
 +	}
 +	return 1;
 +}
 +#endif
 +
  #if LIBCURL_VERSION_NUM >= 0x071900
  static void set_curl_keepalive(CURL *c)
  {