From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jan 2010 23:48:38 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~104
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/054d2fa05cf0bc55fe1556c9e87d58d67a144f44?hp=-c

Merge branch 'maint'

* maint:
remote-curl: Fix Accept header for smart HTTP connections
grep: -L should show empty files
rebase--interactive: Ignore comments and blank lines in peek_next_command
---

054d2fa05cf0bc55fe1556c9e87d58d67a144f44
diff --combined remote-curl.c
index 28b2a316d3,8f169ddca0..70fdceade5
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -290,7 -290,6 +290,7 @@@ struct rpc_state 
  	int out;
  	struct strbuf result;
  	unsigned gzip_request : 1;
 +	unsigned initial_buffer : 1;
  };
  
  static size_t rpc_out(void *ptr, size_t eltsize,
@@@ -301,7 -300,6 +301,7 @@@
  	size_t avail = rpc->len - rpc->pos;
  
  	if (!avail) {
 +		rpc->initial_buffer = 0;
  		avail = packet_read_line(rpc->out, rpc->buf, rpc->alloc);
  		if (!avail)
  			return 0;
@@@ -316,29 -314,6 +316,29 @@@
  	return avail;
  }
  
 +#ifndef NO_CURL_IOCTL
 +curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 +{
 +	struct rpc_state *rpc = clientp;
 +
 +	switch (cmd) {
 +	case CURLIOCMD_NOP:
 +		return CURLIOE_OK;
 +
 +	case CURLIOCMD_RESTARTREAD:
 +		if (rpc->initial_buffer) {
 +			rpc->pos = 0;
 +			return CURLIOE_OK;
 +		}
 +		fprintf(stderr, "Unable to rewind rpc post data - try increasing http.postBuffer\n");
 +		return CURLIOE_FAILRESTART;
 +
 +	default:
 +		return CURLIOE_UNKNOWNCMD;
 +	}
 +}
 +#endif
 +
  static size_t rpc_in(const void *ptr, size_t eltsize,
  		size_t nmemb, void *buffer_)
  {
@@@ -395,13 -370,8 +395,13 @@@ static int post_rpc(struct rpc_state *r
  		 */
  		headers = curl_slist_append(headers, "Expect: 100-continue");
  		headers = curl_slist_append(headers, "Transfer-Encoding: chunked");
 +		rpc->initial_buffer = 1;
  		curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, rpc_out);
  		curl_easy_setopt(slot->curl, CURLOPT_INFILE, rpc);
 +#ifndef NO_CURL_IOCTL
 +		curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, rpc_ioctl);
 +		curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, rpc);
 +#endif
  		if (options.verbosity > 1) {
  			fprintf(stderr, "POST %s (chunked)\n", rpc->service_name);
  			fflush(stderr);
@@@ -510,7 -480,7 +510,7 @@@ static int rpc_service(struct rpc_stat
  	strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
  	rpc->hdr_content_type = strbuf_detach(&buf, NULL);
  
- 	strbuf_addf(&buf, "Accept: application/x-%s-response", svc);
+ 	strbuf_addf(&buf, "Accept: application/x-%s-result", svc);
  	rpc->hdr_accept = strbuf_detach(&buf, NULL);
  
  	while (!err) {