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/preproxy.d | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/cmdline-opts/preproxy.d') diff --git a/docs/cmdline-opts/preproxy.d b/docs/cmdline-opts/preproxy.d index ebef4ab07..b8eb77fa4 100644 --- a/docs/cmdline-opts/preproxy.d +++ b/docs/cmdline-opts/preproxy.d @@ -3,8 +3,9 @@ Arg: [protocol://]host[:port] Help: Use this proxy first Added: 7.52.0 --- -Use the specified proxy before connecting to the ordinary proxy. Hence pre -proxy. A pre proxy must be a SOCKS speaking proxy. +Use the specified SOCKS proxy before connecting to an HTTP or HTTPS --proxy. In +such a case curl first connects to the SOCKS proxy and then connects (through +SOCKS) to the HTTP or HTTPS proxy. Hence pre proxy. The pre proxy string should be specified with a protocol:// prefix to specify alternative proxy protocols. Use socks4://, socks4a://, socks5:// or -- cgit v1.2.3