mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/http-auth'

Browse Source 
* jk/http-auth:
  http_init: accept separate URL parameter
  http: use hostname in credential description
  http: retry authentication failures for all http requests
  remote-curl: don't retry auth failures with dumb protocol
  improve httpd auth tests
  url: decode buffers that are not NUL-terminated
This commit is contained in:
Junio C Hamano
2011-10-17 21:37:15 -07:00
parent 7f8a9387fd deba49377b
commit 963838402a
9 changed files with 133 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
http-push.c
View File

@ -1747,7 +1747,6 @@ int main(int argc, char **argv)
int i;
int new_refs;
struct ref *ref, *local_refs;
struct remote *remote;
git_extract_argv0_path(argv[0]);
@ -1821,14 +1820,7 @@ int main(int argc, char **argv)
memset(remote_dir_exists, -1, 256);
/*
* Create a minimum remote by hand to give to http_init(),
* primarily to allow it to look at the URL.
*/
remote = xcalloc(sizeof(*remote), 1);
ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
remote->url[remote->url_nr++] = repo->url;
http_init(remote);
http_init(NULL, repo->url);
#ifdef USE_CURL_MULTI
is_running_queue = 0;