diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:23 -0700 |
| commit | c953cf95a5fdf2fa1b8f288db6b1a0398d6e8311 (patch) | |
| tree | 271bbec5f1b1eff20b822bde4a28b2b6ff560716 | |
| parent | Merge branch 'dp/filter-branch-prune-empty' into maint (diff) | |
| parent | http: release strbuf on disabled alternates (diff) | |
| download | tgif-c953cf95a5fdf2fa1b8f288db6b1a0398d6e8311.tar.xz | |
Merge branch 'ew/http-alternates-as-redirects-warning' into maint
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
* ew/http-alternates-as-redirects-warning:
http: release strbuf on disabled alternates
http: inform about alternates-as-redirects behavior
| -rw-r--r-- | http-walker.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/http-walker.c b/http-walker.c index 507c200f00..ee049cb13d 100644 --- a/http-walker.c +++ b/http-walker.c @@ -168,6 +168,11 @@ static int is_alternate_allowed(const char *url) }; int i; + if (http_follow_config != HTTP_FOLLOW_ALWAYS) { + warning("alternate disabled by http.followRedirects: %s", url); + return 0; + } + for (i = 0; i < ARRAY_SIZE(protocols); i++) { const char *end; if (skip_prefix(url, protocols[i], &end) && @@ -317,6 +322,8 @@ static void process_alternates_response(void *callback_data) while (tail->next != NULL) tail = tail->next; tail->next = newalt; + } else { + strbuf_release(&target); } } } @@ -334,9 +341,6 @@ static void fetch_alternates(struct walker *walker, const char *base) struct alternates_request alt_req; struct walker_data *cdata = walker->data; - if (http_follow_config != HTTP_FOLLOW_ALWAYS) - return; - /* * If another request has already started fetching alternates, * wait for them to arrive and return to processing this request's |