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.
This commit is contained in:
Jay Satiro 2017-02-09 18:26:16 -05:00
parent 1dcf244721
commit 7017c421a1
5 changed files with 23 additions and 14 deletions

View file

@ -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