]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.26.2
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2020 05:05:56 +0000 (22:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2020 05:05:56 +0000 (22:05 -0700)
1  2 
http.c

diff --cc http.c
index 4283be9479b1f58470b5752b92a75cb01467dbcf,5f712634825ee7a9a10c344f889ca262f94f6407..62aa995245324dc30fec699ed8c570af7b152b8f
--- 1/http.c
--- 2/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)
  {