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

diff --cc http-fetch.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc http.c
Simple merge

diff --cc remote-curl.c
index 0aa4bfed309d6c439fac4ff2a0df6a468307e7bf,d4d0910e60200f0592c46aa2075acbe8394f7f85..0e720ee8bbf4cbc6a50336a1f1c93bfc63842fe3
--- 1/remote-curl.c
--- 2/remote-curl.c
+++ b/remote-curl.c
@@@ -859,17 -850,10 +859,17 @@@ 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)
 +              if (strbuf_getline(&buf, stdin, '\n') == EOF) {
 +                      if (ferror(stdin))
 +                              fprintf(stderr, "Error reading command stream\n");
 +                      else
 +                              fprintf(stderr, "Unexpected end of command stream\n");
 +                      return 1;
 +              }
 +              if (buf.len == 0)
                        break;
                if (!prefixcmp(buf.buf, "fetch ")) {
                        if (nongit)

diff --cc url.c
Simple merge