From 7017c421a1683a809c7cc18459a16bafc736626f Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Thu, 9 Feb 2017 18:26:16 -0500 Subject: cmdline-opts/socks*: Mention --preproxy in --socks* opts - Document in --socks* opts they're still mutually exclusive of --proxy. Partial revert of 423a93c; I had misinterpreted the SOCKS proxy + HTTP/HTTPS proxy combination. - Document in --socks* opts that --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. --- docs/cmdline-opts/socks4a.d | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/cmdline-opts/socks4a.d') 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. -- cgit v1.2.3