diff options
| author | Max Kirillov <max@max630.net> | 2018-06-10 15:05:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-11 20:21:36 (GMT) |
| commit | 6b1fae1dfbbdb6dc352567c0fc45a9e87474192d (patch) | |
| tree | 6e9309dda9bb374a876f3889b93d778e3146ac9b /http-backend.c | |
| parent | c2c7d17b030646b40e6764ba34a5ebf66aee77af (diff) | |
| download | git-6b1fae1dfbbdb6dc352567c0fc45a9e87474192d.zip git-6b1fae1dfbbdb6dc352567c0fc45a9e87474192d.tar.gz git-6b1fae1dfbbdb6dc352567c0fc45a9e87474192d.tar.bz2 | |
http-backend: cleanup writing to child process
As explained in [1], we should not assume the reason why the writing has
failed, and even if the reason is that child has existed not the reason
why it have done so. So instead just say that writing has failed.
[1] https://public-inbox.org/git/20180604044408.GD14451@sigill.intra.peff.net/
Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-backend.c')
| -rw-r--r-- | http-backend.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/http-backend.c b/http-backend.c index adaef16..cefdfd6 100644 --- a/http-backend.c +++ b/http-backend.c @@ -279,6 +279,12 @@ static struct rpc_service *select_service(struct strbuf *hdr, const char *name) return svc; } +static void write_to_child(int out, const unsigned char *buf, ssize_t len, const char *prog_name) +{ + if (write_in_full(out, buf, len) < 0) + die("unable to write to '%s'", prog_name); +} + /* * This is basically strbuf_read(), except that if we * hit max_request_buffer we die (we'd rather reject a @@ -361,9 +367,8 @@ static void inflate_request(const char *prog_name, int out, int buffer_input) die("zlib error inflating request, result %d", ret); n = stream.total_out - cnt; - if (write_in_full(out, out_buf, n) < 0) - die("%s aborted reading request", prog_name); - cnt += n; + write_to_child(out, out_buf, stream.total_out - cnt, prog_name); + cnt = stream.total_out; if (ret == Z_STREAM_END) goto done; @@ -382,8 +387,7 @@ static void copy_request(const char *prog_name, int out) ssize_t n = read_request(0, &buf); if (n < 0) die_errno("error reading request body"); - if (write_in_full(out, buf, n) < 0) - die("%s aborted reading request", prog_name); + write_to_child(out, buf, n, prog_name); close(out); free(buf); } |