[PATCH] remote-curl: Fix warning after HTTP failure

[PATCH] remote-curl: Fix warning after HTTP failure

[Shawn O. Pearce]

From: "Shawn O. Pearce" <spearce@spearce.org>

If the HTTP connection is broken in the middle of a fetch or clone
body, the client presented a useless error message due to part of
the upload-pack->remote-curl pkt-line protocol leaking out of the
helper as the helper's "fetch result":

  error: RPC failed; result=18, HTTP code = 200
  fatal: The remote end hung up unexpectedly
  fatal: early EOF
  fatal: unpack-objects failed
  warning: https unexpectedly said: '0000'

Instead when the HTTP RPC fails discard all remaining data from
upload-pack and report nothing to the transport helper. Errors
were already sent to stderr.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 remote-curl.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/remote-curl.c b/remote-curl.c
index 69831e9..d2bf832 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -573,7 +573,16 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
 
 	close(client.in);
 	client.in = -1;
-	strbuf_read(&rpc->result, client.out, 0);
+	if (!err) {
+	  strbuf_read(&rpc->result, client.out, 0);
+	} else {
+		char buf[4096];
+		for (;;) {
+			int n = read(client.out, buf, sizeof(buf));
+			if (n <= 0)
+			  break;
+		}
+	}
 
 	close(client.out);
 	client.out = -1;
-- 
1.7.6.4.dirty