зеркало из https://github.com/microsoft/git.git
http: eliminate "# service" line when using protocol v2
When an http info/refs request is made, requesting that protocol v2 be used, don't send a "# service" line since this line is not part of the v2 spec. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
884e586f9e
Коммит
237ffedd46
|
@ -10,6 +10,7 @@
|
|||
#include "url.h"
|
||||
#include "argv-array.h"
|
||||
#include "packfile.h"
|
||||
#include "protocol.h"
|
||||
|
||||
static const char content_type[] = "Content-Type";
|
||||
static const char content_length[] = "Content-Length";
|
||||
|
@ -466,8 +467,11 @@ static void get_info_refs(struct strbuf *hdr, char *arg)
|
|||
hdr_str(hdr, content_type, buf.buf);
|
||||
end_headers(hdr);
|
||||
|
||||
packet_write_fmt(1, "# service=git-%s\n", svc->name);
|
||||
packet_flush(1);
|
||||
|
||||
if (determine_protocol_version_server() != protocol_v2) {
|
||||
packet_write_fmt(1, "# service=git-%s\n", svc->name);
|
||||
packet_flush(1);
|
||||
}
|
||||
|
||||
argv[0] = svc->name;
|
||||
run_service(argv, 0);
|
||||
|
|
|
@ -396,6 +396,9 @@ static struct discovery *discover_refs(const char *service, int for_push)
|
|||
;
|
||||
|
||||
last->proto_git = 1;
|
||||
} else if (maybe_smart &&
|
||||
last->len > 5 && starts_with(last->buf + 4, "version 2")) {
|
||||
last->proto_git = 1;
|
||||
}
|
||||
|
||||
if (last->proto_git)
|
||||
|
|
Загрузка…
Ссылка в новой задаче