Skip to content

Commit

Permalink
remote-curl: rename is_http variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Sep 20, 2012
1 parent 6ac964a commit 243c329
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions remote-curl.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ static struct discovery* discover_refs(const char *service)
struct strbuf buffer = STRBUF_INIT;
struct discovery *last = last_discovery;
char *refs_url;
int http_ret, is_http = 0;
int http_ret, maybe_smart = 0;

if (last && !strcmp(service, last->service))
return last;
free_discovery(last);

strbuf_addf(&buffer, "%sinfo/refs", url);
if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
is_http = 1;
maybe_smart = 1;
if (!strchr(url, '?'))
strbuf_addch(&buffer, '?');
else
Expand Down Expand Up @@ -131,7 +131,7 @@ static struct discovery* discover_refs(const char *service)
last->buf_alloc = strbuf_detach(&buffer, &last->len);
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
* pkt-line matches our request.
*/
Expand Down

0 comments on commit 243c329

Please sign in to comment.