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

diff --cc http.c
index 8e72664061b1bafe18a51bc1fdcb3f36a4eeb1d5,7e454f7787b8b9ca3b023be7e5c37cbf7367fc20..0ffd79cd81ba3e722dcdbf4c20469fa551ce9d80
--- 1/http.c
--- 2/http.c
+++ b/http.c
@@@ -42,7 -42,8 +42,8 @@@ static long curl_low_speed_time = -1
  static int curl_ftp_no_epsv;
  static const char *curl_http_proxy;
  static const char *curl_cookie_file;
 -static char *user_name, *user_pass, *description;
 +static struct credential http_auth = CREDENTIAL_INIT;
+ static int http_proactive_auth;
  static const char *user_agent;
  
  #if LIBCURL_VERSION_NUM >= 0x071700

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