@matheusbsbs / matheus-bagliano / commits / 5b204b7df3

fetch-pack: send server options after command

Currently, if any server options are specified during a protocol v2 fetch, server options will be sent before "command=fetch". Write server options to the request buffer in send_fetch_request() so that the components of the request are sent in the correct order. The protocol documentation states that the command must come first. The Git server implementation in serve.c (see process_request() in that file) tolerates any order of command and capability, which is perhaps why we haven't noticed this. This was noticed when testing against a JGit server implementation, which follows the documentation in this regard. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Tan committed May 22, 2019 at 13:08 UTC 5b204b7df3ed7e97040d40db9d7c31a0a645af15

1 file changed +1 -1

fetch-pack.c

+1 -1

@@ -1111,7 +1111,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,

1111 server_supports_v2("server-option", 1)) {

1112 int i;

1113 for (i = 0; i < args->server_options->nr; i++)

1114 - packet_write_fmt(fd_out, "server-option=%s",

1114 + packet_buf_write(&req_buf, "server-option=%s",

1115 args->server_options->items[i].string);

1116 }

1117