diff options
| author | Masaya Suzuki <masayasuzuki@google.com> | 2018-12-29 21:19:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-02 21:05:30 (GMT) |
| commit | 2d103c31c2cfcf03ff1408d639043469b0c93f70 (patch) | |
| tree | 17a4e7a35fb5401fad2b8713e17360af0573682e /remote-curl.c | |
| parent | 01f9ec64c8a82a05ba7e5a17b292ede037a469ea (diff) | |
| download | git-2d103c31c2cfcf03ff1408d639043469b0c93f70.zip git-2d103c31c2cfcf03ff1408d639043469b0c93f70.tar.gz git-2d103c31c2cfcf03ff1408d639043469b0c93f70.tar.bz2 | |
pack-protocol.txt: accept error packets in any context
In the Git pack protocol definition, an error packet may appear only in
a certain context. However, servers can face a runtime error (e.g. I/O
error) at an arbitrary timing. This patch changes the protocol to allow
an error packet to be sent instead of any packet.
Without this protocol spec change, when a server cannot process a
request, there's no way to tell that to a client. Since the server
cannot produce a valid response, it would be forced to cut a connection
without telling why. With this protocol spec change, the server can be
more gentle in this situation. An old client may see these error packets
as an unexpected packet, but this is not worse than having an unexpected
EOF.
Following this protocol spec change, the error packet handling code is
moved to pkt-line.c. Implementation wise, this implementation uses
pkt-line to communicate with a subprocess. Since this is not a part of
Git protocol, it's possible that a packet that is not supposed to be an
error packet is mistakenly parsed as an error packet. This error packet
handling is enabled only for the Git pack protocol parsing code
considering this.
Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/remote-curl.c b/remote-curl.c index bbd9ba0..10b5086 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -204,7 +204,8 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push) packet_reader_init(&reader, -1, heads->buf, heads->len, PACKET_READ_CHOMP_NEWLINE | - PACKET_READ_GENTLE_ON_EOF); + PACKET_READ_GENTLE_ON_EOF | + PACKET_READ_DIE_ON_ERR_PACKET); heads->version = discover_version(&reader); switch (heads->version) { @@ -411,7 +412,8 @@ static struct discovery *discover_refs(const char *service, int for_push) !strbuf_cmp(&exp, &type)) { struct packet_reader reader; packet_reader_init(&reader, -1, last->buf, last->len, - PACKET_READ_CHOMP_NEWLINE); + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_DIE_ON_ERR_PACKET); /* * smart HTTP response; validate that the service @@ -1182,7 +1184,8 @@ static void proxy_state_init(struct proxy_state *p, const char *service_name, p->headers = curl_slist_append(p->headers, buf.buf); packet_reader_init(&p->reader, p->in, NULL, 0, - PACKET_READ_GENTLE_ON_EOF); + PACKET_READ_GENTLE_ON_EOF | + PACKET_READ_DIE_ON_ERR_PACKET); strbuf_release(&buf); } |