summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:59 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:59 -0800
commit1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c (patch)
tree58d0280090c8c26915a20c894a84b7a951ac8004 /http.h
parentb3ae9d8e57166c771926e3f55555bf248b71202a (diff)
parenta4ddbc33d7906f0e10c68c140a9a1003d9715a77 (diff)
downloadgit-1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c.tar.gz
Merge branch 'jk/maint-push-over-dav'
* jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication Conflicts: http.c
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 ee1606942a..0b61653894 100644
--- a/http.h
+++ b/http.h
@@ -85,7 +85,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 active_requests;