From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2009 05:33:05 +0000 (-0700)
Subject: Merge branch 'ms/http-auth'
X-Git-Tag: v1.6.3-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe42fe4bcaaf262082a982e43bca1d8cac5a706d?hp=-c

Merge branch 'ms/http-auth'

* ms/http-auth:
Allow curl to rewind the read buffers
---

fe42fe4bcaaf262082a982e43bca1d8cac5a706d
diff --combined http-push.c
index e465b20c1a,7dc0dd4ec7..feeb340daf
--- a/http-push.c
+++ b/http-push.c
@@@ -567,6 -567,10 +567,10 @@@ static void start_put(struct transfer_r
  	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &request->buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, request->buffer.buf.len);
  	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &request->buffer);
+ #endif
  	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
  	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
  	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
@@@ -748,6 -752,7 +752,6 @@@ static void finish_request(struct trans
  			aborted = 1;
  		}
  	} else if (request->state == RUN_FETCH_LOOSE) {
 -		fchmod(request->local_fileno, 0444);
  		close(request->local_fileno); request->local_fileno = -1;
  
  		if (request->curl_result != CURLE_OK &&
@@@ -1266,6 -1271,10 +1270,10 @@@ static struct remote_lock *lock_remote(
  	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
  	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &out_buffer);
+ #endif
  	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
@@@ -1507,6 -1516,10 +1515,10 @@@ static void remote_ls(const char *path
  	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
  	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &out_buffer);
+ #endif
  	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
@@@ -1583,6 -1596,10 +1595,10 @@@ static int locking_available(void
  	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
  	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &out_buffer);
+ #endif
  	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, repo->url);
@@@ -1765,6 -1782,10 +1781,10 @@@ static int update_remote(unsigned char 
  	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
  	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
  	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 	curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &out_buffer);
+ #endif
  	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
  	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
  	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
@@@ -1909,6 -1930,10 +1929,10 @@@ static void update_remote_info_refs(str
  		curl_easy_setopt(slot->curl, CURLOPT_INFILE, &buffer);
  		curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, buffer.buf.len);
  		curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
+ #ifndef NO_CURL_IOCTL
+ 		curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
+ 		curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, &buffer);
+ #endif
  		curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
  		curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
  		curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);