summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-11-02 12:14:12 (GMT)
committerBrad King <brad.king@kitware.com>2018-11-02 12:14:12 (GMT)
commitc1ad5118deb0eb52c2130e0fb3363f44c25bf42e (patch)
treea883220d18da9b836ab4d1885bf6d684b8087671 /Utilities
parent03bf934fbe93ef04d6c62c64912d2f212db997b7 (diff)
downloadCMake-c1ad5118deb0eb52c2130e0fb3363f44c25bf42e.zip
CMake-c1ad5118deb0eb52c2130e0fb3363f44c25bf42e.tar.gz
CMake-c1ad5118deb0eb52c2130e0fb3363f44c25bf42e.tar.bz2
curl: backport upstream fix to 7.62.0 regression
Backport upstream curl commit 2c5ec339ea (Curl_follow: accept non-supported schemes for "fake" redirects, 2018-11-01) to get a fix to curl issue 3210, a regression in 7.62.0.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/lib/transfer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/transfer.c b/Utilities/cmcurl/lib/transfer.c
index b73f94d..05ba862 100644
--- a/Utilities/cmcurl/lib/transfer.c
+++ b/Utilities/cmcurl/lib/transfer.c
@@ -1514,7 +1514,8 @@ CURLcode Curl_follow(struct Curl_easy *data,
disallowport = TRUE;
DEBUGASSERT(data->state.uh);
- uc = curl_url_set(data->state.uh, CURLUPART_URL, newurl, 0);
+ uc = curl_url_set(data->state.uh, CURLUPART_URL, newurl,
+ (type == FOLLOW_FAKE) ? CURLU_NON_SUPPORT_SCHEME : 0);
if(uc)
return Curl_uc_to_curlcode(uc);