http: eliminate "# service" line when using protocol v2

bmwill · gitster · commit 237ffedd4609 · 2018-03-15T12:01:09.000-07:00
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 &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/http-backend.c b/http-backend.c
@@ -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);
diff --git a/remote-curl.c b/remote-curl.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,9 @@ static struct discovery discover_refs(const char service, int for_push)`
`396`	`396`	`;`
`397`	`397`
`398`	`398`	`last->proto_git = 1;`
	`399`	`+ } else if (maybe_smart &&`
	`400`	`+ last->len > 5 && starts_with(last->buf + 4, "version 2")) {`
	`401`	`+ last->proto_git = 1;`
`399`	`402`	`}`
`400`	`403`
`401`	`404`	`if (last->proto_git)`