Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint

* sp/fix-smart-http-deadlock-on-error: smart-http: Don't deadlock on server failure
git-mirror · Aug 18, 2010 · 0a4139b · 0a4139b
2 parents 452c6d5 + b4ee10f
commit 0a4139b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/remote-curl.c b/remote-curl.c
@@ -528,11 +528,12 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
 		rpc->len = n;
 		err |= post_rpc(rpc);
 	}
-	strbuf_read(&rpc->result, client.out, 0);
 
 	close(client.in);
-	close(client.out);
 	client.in = -1;
+	strbuf_read(&rpc->result, client.out, 0);
+
+	close(client.out);
 	client.out = -1;
 
 	err |= finish_command(&client);