Merge branch 'jk/maint-push-over-dav' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:37 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:37 +0000 (11:32 -0800)
* jk/maint-push-over-dav:
  http-push: enable "proactive auth"
  t5540: test DAV push with authentication

1  2 
http.c
http.h
remote-curl.c

diff --cc http.c
Simple merge
diff --cc http.h
index ee1606942a9716b45da937873949220ab7f8092b,51f6ba73bafca0c1939b3e74e39bf15308d03f7a..0b61653894eff606980427ee26770fa088438b94
--- 1/http.h
--- 2/http.h
+++ b/http.h
@@@ -85,9 -86,11 +85,10 @@@ extern void add_fill_function(void *dat
  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;
  extern int active_requests;
  extern int http_is_verbose;
  extern size_t http_post_buffer;
diff --cc remote-curl.c
Simple merge