summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-12-13 19:11:56 -0500
committerJunio C Hamano <gitster@pobox.com>2011-12-13 16:34:44 -0800
commita4ddbc33d7906f0e10c68c140a9a1003d9715a77 (patch)
treed5326b24cdb37c93c57763f8079f7b0f59061091 /http.h
parent0521710a8b9321751ca8768c3f7ea8895901e5c3 (diff)
downloadgit-a4ddbc33d7906f0e10c68c140a9a1003d9715a77.tar.gz
http-push: enable "proactive auth"jk/maint-push-over-dav
Before commit 986bbc08, git was proactive about asking for http passwords. It assumed that if you had a username in your URL, you would also want a password, and asked for it before making any http requests. However, this could interfere with the use of .netrc (see 986bbc08 for details). And it was also unnecessary, since the http fetching code had learned to recognize an HTTP 401 and prompt the user then. Furthermore, the proactive prompt could interfere with the usage of .netrc (see 986bbc08 for details). Unfortunately, the http push-over-DAV code never learned to recognize HTTP 401, and so was broken by this change. This patch does a quick fix of re-enabling the "proactive auth" strategy only for http-push, leaving the dumb http fetch and smart-http as-is. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.h')
-rw-r--r--http.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/http.h b/http.h
index 3c332a98e9..51f6ba73ba 100644
--- a/http.h
+++ b/http.h
@@ -86,7 +86,8 @@ extern void add_fill_function(void *data, int (*fill)(void *));
extern void step_active_slots(void);
#endif
-extern void http_init(struct remote *remote, const char *url);
+extern void http_init(struct remote *remote, const char *url,
+ int proactive_auth);
extern void http_cleanup(void);
extern int data_received;