Browse Source

remote-curl: rename is_http variable

We don't actually care whether the connection is http or
not; what we care about is whether it might be smart http.
Rename the variable to be more accurate, which will make it
easier to later make smart-http optional.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 13 years ago committed by Junio C Hamano
parent
commit
243c329c1e
  1. 6
      remote-curl.c

6
remote-curl.c

@ -95,7 +95,7 @@ static struct discovery* discover_refs(const char *service)
struct strbuf buffer = STRBUF_INIT; struct strbuf buffer = STRBUF_INIT;
struct discovery *last = last_discovery; struct discovery *last = last_discovery;
char *refs_url; char *refs_url;
int http_ret, is_http = 0; int http_ret, maybe_smart = 0;


if (last && !strcmp(service, last->service)) if (last && !strcmp(service, last->service))
return last; return last;
@ -103,7 +103,7 @@ static struct discovery* discover_refs(const char *service)


strbuf_addf(&buffer, "%sinfo/refs", url); strbuf_addf(&buffer, "%sinfo/refs", url);
if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) { if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
is_http = 1; maybe_smart = 1;
if (!strchr(url, '?')) if (!strchr(url, '?'))
strbuf_addch(&buffer, '?'); strbuf_addch(&buffer, '?');
else else
@ -131,7 +131,7 @@ static struct discovery* discover_refs(const char *service)
last->buf_alloc = strbuf_detach(&buffer, &last->len); last->buf_alloc = strbuf_detach(&buffer, &last->len);
last->buf = last->buf_alloc; last->buf = last->buf_alloc;


if (is_http && 5 <= last->len && last->buf[4] == '#') { if (maybe_smart && 5 <= last->len && last->buf[4] == '#') {
/* smart HTTP response; validate that the service /* smart HTTP response; validate that the service
* pkt-line matches our request. * pkt-line matches our request.
*/ */

Loading…
Cancel
Save