diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-13 05:27:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-13 05:27:01 +0400 |
| commit | 1c80c9b2cb5ae0d8c77f3c73730225ca19aeef4a (patch) | |
| tree | 269998f9a216266ab71bcd57786aeeacf2cbffdc /remote-curl.c | |
| parent | 642f7108f68ef622b338d27d94a956e32c8567dd (diff) | |
| parent | b4ee10f60fb46e0305968023c1ab0f072535b630 (diff) | |
Merge branch 'sp/fix-smart-http-deadlock-on-error'
* sp/fix-smart-http-deadlock-on-error:
smart-http: Don't deadlock on server failure
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remote-curl.c b/remote-curl.c index 24fbb9a9b9..04d4813e41 100644 --- 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); |