mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
Merge branch 'bc/http-keep-memory-given-to-curl' into maint
Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * bc/http-keep-memory-given-to-curl: http.c: don't rewrite the user:passwd string multiple times
This commit is contained in:
commit
29b2f0565a
12
http.c
12
http.c
|
@ -228,9 +228,15 @@ static void init_curl_http_auth(CURL *result)
|
||||||
#else
|
#else
|
||||||
{
|
{
|
||||||
static struct strbuf up = STRBUF_INIT;
|
static struct strbuf up = STRBUF_INIT;
|
||||||
strbuf_reset(&up);
|
/*
|
||||||
strbuf_addf(&up, "%s:%s",
|
* Note that we assume we only ever have a single set of
|
||||||
http_auth.username, http_auth.password);
|
* credentials in a given program run, so we do not have
|
||||||
|
* to worry about updating this buffer, only setting its
|
||||||
|
* initial value.
|
||||||
|
*/
|
||||||
|
if (!up.len)
|
||||||
|
strbuf_addf(&up, "%s:%s",
|
||||||
|
http_auth.username, http_auth.password);
|
||||||
curl_easy_setopt(result, CURLOPT_USERPWD, up.buf);
|
curl_easy_setopt(result, CURLOPT_USERPWD, up.buf);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue