diff options
| author |  Brandon Williams <bmwill@google.com> | 2016-12-14 14:39:51 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-12-15 09:28:37 -0800 |
| commit | f962ddf6edb199b2611d575a75f60d20d5c137c3 (patch) | |
| tree | 81b5da0a0ff9d250afc9c26eef239a48e6cd0ff9 | |
| parent | lib-proto-disable: variable name fix (diff) | |
| download | tgif-f962ddf6edb199b2611d575a75f60d20d5c137c3.tar.xz | |
http: always warn if libcurl version is too old
Always warn if libcurl version is too old because:
1. Even without a protocol whitelist, newer versions of curl have all
non-standard protocols disabled by default.
2. A future patch will introduce default "known-good" and "known-bad"
protocols which are allowed/disallowed by 'is_transport_allowed'
which older version of libcurl can't respect.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | http.c | 5 | ||||
| -rw-r--r-- | transport.c | 5 | ||||
| -rw-r--r-- | transport.h | 6 |
3 files changed, 2 insertions, 14 deletions
@@ -583,9 +583,8 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS, allowed_protocols); curl_easy_setopt(result, CURLOPT_PROTOCOLS, allowed_protocols); #else - if (transport_restrict_protocols()) - warning("protocol restrictions not applied to curl redirects because\n" - "your curl version is too old (>= 7.19.4)"); + warning("protocol restrictions not applied to curl redirects because\n" + "your curl version is too old (>= 7.19.4)"); #endif if (getenv("GIT_CURL_VERBOSE")) diff --git a/transport.c b/transport.c index 41eb82c6f3..dff929ec01 100644 --- a/transport.c +++ b/transport.c @@ -629,11 +629,6 @@ void transport_check_allowed(const char *type) die("transport '%s' not allowed", type); } -int transport_restrict_protocols(void) -{ - return !!protocol_whitelist(); -} - struct transport *transport_get(struct remote *remote, const char *url) { const char *helper; diff --git a/transport.h b/transport.h index c68140892c..3396e1d434 100644 --- a/transport.h +++ b/transport.h @@ -153,12 +153,6 @@ int is_transport_allowed(const char *type); */ void transport_check_allowed(const char *type); -/* - * Returns true if the user has attempted to turn on protocol - * restrictions at all. - */ -int transport_restrict_protocols(void); - /* Transport options which apply to git:// and scp-style URLs */ /* The program to use on the remote side to send a pack */ |