undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/http-keep-memory-given-to-curl'

Browse Source 
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:
Junio C Hamano 2013-06-27 14:29:49 -07:00
commit dc2ed04c23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
http.c
View File

@ -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