aboutsummaryrefslogtreecommitdiff
path: root/docs/cmdline-opts/socks4a.d
diff options
context:
space:
mode:
Diffstat (limited to 'docs/cmdline-opts/socks4a.d')
-rw-r--r--docs/cmdline-opts/socks4a.d8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/cmdline-opts/socks4a.d b/docs/cmdline-opts/socks4a.d
index c7663eebd..ae254ae0e 100644
--- a/docs/cmdline-opts/socks4a.d
+++ b/docs/cmdline-opts/socks4a.d
@@ -6,12 +6,14 @@ Added: 7.18.0
Use the specified SOCKS4a proxy. 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 socks4a proxy
with --proxy using a socks4a:// 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
+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.