diff options
| author | Alessandro Ghedini <ghedo@debian.org> | 2017-08-12 12:27:23 +0100 |
|---|---|---|
| committer | Alessandro Ghedini <ghedo@debian.org> | 2017-08-12 12:27:23 +0100 |
| commit | bdd033d6e4a13df5b45f2628db5738f82ca6b413 (patch) | |
| tree | cf888efddf7f3cf7dd714363ca0f477f2a59b4c6 /docs/cmdline-opts/socks5-hostname.d | |
| parent | d4e5ed3bd25935c7dc74a5fd183032d7649d2db8 (diff) | |
New upstream version 7.55.0
Diffstat (limited to 'docs/cmdline-opts/socks5-hostname.d')
| -rw-r--r-- | docs/cmdline-opts/socks5-hostname.d | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/cmdline-opts/socks5-hostname.d b/docs/cmdline-opts/socks5-hostname.d index d971766a..9d9d946e 100644 --- a/docs/cmdline-opts/socks5-hostname.d +++ b/docs/cmdline-opts/socks5-hostname.d @@ -12,4 +12,8 @@ exclusive. Since 7.21.7, this option is superfluous since you can specify a socks5 hostname proxy with --proxy using a socks5h:// protocol prefix. +Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time +--proxy is used with an HTTP/HTTPS 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. |