smart-http: Don't deadlock on server failure

If the remote HTTP server fails (e.g. returns 404 or 500) when we
posted the RPC to it, we won't have sent anything to the background
Git process that is supposed to handle the stream.  Because we
didn't send anything, its waiting for input from remote-curl, and
remote-curl cannot read its response payload because doing so would
lead to a deadlock.

Send the background task EOF on its input before we try to read
its response back, that way it will break out of its read loop
and terminate.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shawn O. Pearce 2010-08-06 14:19:44 -07:00 коммит произвёл Junio C Hamano
Родитель 4133fd2552
Коммит b4ee10f60f
1 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -505,11 +505,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);