From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 00:05:59 +0000 (-0800)
Subject: Merge branch 'jk/maint-push-over-dav'
X-Git-Tag: v1.7.9-rc0~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c;p=git.git

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
---

1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c
diff --cc http.c
index 8e7266406,7e454f778..0ffd79cd8
--- a/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 ee1606942,51f6ba73b..0b6165389
--- a/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;