diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:15 -0700 |
| commit | 963838402a94e7fcbd1a73019f80aff708972af8 (patch) | |
| tree | dfc5a1a62cfd83d5e199974ace5725d5a7fe6946 /remote-curl.c | |
| parent | 7f8a9387fd28b1cc4029bb8a8d66cd577d8dd1e3 (diff) | |
| parent | deba49377b717d1e26c342f65c7f5e75a2db8641 (diff) | |
| download | git-963838402a94e7fcbd1a73019f80aff708972af8.tar.gz | |
Merge branch 'jk/http-auth'
* 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
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remote-curl.c b/remote-curl.c index 0aa4bfed30..0e720ee8bb 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -115,7 +115,7 @@ static struct discovery* discover_refs(const char *service) http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); /* try again with "plain" url (no ? or & appended) */ - if (http_ret != HTTP_OK) { + if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) { free(refs_url); strbuf_reset(&buffer); @@ -859,7 +859,7 @@ int main(int argc, const char **argv) url = strbuf_detach(&buf, NULL); - http_init(remote); + http_init(remote, url); do { if (strbuf_getline(&buf, stdin, '\n') == EOF) { |