aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2019-07-16 03:35:54 -0400
committerJay Satiro <raysatiro@yahoo.com>2019-07-17 00:48:40 -0400
commite8442e4ffcecf3e290c7e26c44e4aa313e016f9a (patch)
tree71a78f4cb2afd84d1479f126affbfe3857a13eab /lib
parent647e726d78798356b5af7585ededd762ba76df6e (diff)
libcurl: Restrict redirect schemes (follow-up)
- Allow FTPS on redirect. - Update default allowed redirect protocols in documentation. Follow-up to 6080ea0. Ref: https://github.com/curl/curl/pull/4094 Closes https://github.com/curl/curl/pull/4115
Diffstat (limited to 'lib')
-rw-r--r--lib/setopt.c3
-rw-r--r--lib/url.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/setopt.c b/lib/setopt.c
index bdfe86ac7..1dbf00faf 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -2374,8 +2374,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
case CURLOPT_REDIR_PROTOCOLS:
/* set the bitmask for the protocols that libcurl is allowed to follow to,
as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
- to be set in both bitmasks to be allowed to get redirected to. Defaults
- to all protocols except FILE and SCP. */
+ to be set in both bitmasks to be allowed to get redirected to. */
data->set.redir_protocols = va_arg(param, long);
break;
diff --git a/lib/url.c b/lib/url.c
index 258f60c8f..2b47b235d 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -488,7 +488,8 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
define since we internally only use the lower 16 bits for the passed
in bitmask to not conflict with the private bits */
set->allowed_protocols = CURLPROTO_ALL;
- set->redir_protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP;
+ set->redir_protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP |
+ CURLPROTO_FTPS;
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
/*