aboutsummaryrefslogtreecommitdiff
path: root/docs/cmdline-opts/preproxy.d
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2017-02-09 18:26:16 -0500
committerJay Satiro <raysatiro@yahoo.com>2017-02-09 18:26:16 -0500
commit7017c421a1683a809c7cc18459a16bafc736626f (patch)
treee7507cb2d6583351d546c44a942b18b4d55a916a /docs/cmdline-opts/preproxy.d
parent1dcf2447212996f0772f953f38ac5930ba3311b3 (diff)
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.
Diffstat (limited to 'docs/cmdline-opts/preproxy.d')
-rw-r--r--docs/cmdline-opts/preproxy.d5
1 files changed, 3 insertions, 2 deletions
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