Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sp/fix-smart-http-deadlock-on-error'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 13 Aug 2010 01:27:01 +0000
(18:27 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 13 Aug 2010 01:27:01 +0000
(18:27 -0700)
* sp/fix-smart-http-deadlock-on-error:
smart-http: Don't deadlock on server failure
remote-curl.c
patch
|
blob
|
history
raw
(from parent 1:
642f710
)
diff --git
a/remote-curl.c
b/remote-curl.c
index 24fbb9a9b972c1078b3688b2d0683c9704e09ee6..04d4813e4183c675b54aba942cd078d8ff632053 100644
(file)
--- 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);