diff options
Diffstat (limited to 'docs/cmdline-opts/socks5.d')
| -rw-r--r-- | docs/cmdline-opts/socks5.d | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/cmdline-opts/socks5.d b/docs/cmdline-opts/socks5.d index 34f0311ed..aa07afeb1 100644 --- a/docs/cmdline-opts/socks5.d +++ b/docs/cmdline-opts/socks5.d @@ -6,12 +6,14 @@ Added: 7.18.0 Use the specified SOCKS5 proxy - but resolve the host name locally. If the port number is not specified, it is assumed at port 1080. -This option overrides any previous use of --proxy, as they are mutually -exclusive. - Since 7.21.7, this option is superfluous since you can specify a socks5 proxy with --proxy using a socks5:// protocol prefix. +This option typically overrides any previous use of --proxy; however since +7.52.0 if --proxy is used to specify an HTTP or HTTPS proxy then curl will +attempt to use it with the SOCKS proxy. In such a case curl first connects to +the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. + If this option is used several times, the last one will be used. This option (as well as --socks4) does not work with IPV6, FTPS or LDAP. |