moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

cmdline-opts/socks*: Mention --preproxy in --socks* opts

Browse Source 
- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/cmdline-opts/preproxy.d
View File

@ -3,8 +3,9 @@ Arg: [protocol://]host[:port]
Help: Use this proxy first Help: Use this proxy first
Added: 7.52.0 Added: 7.52.0
--- ---
Use the specified proxy before connecting to the ordinary proxy. Hence pre Use the specified SOCKS proxy before connecting to an HTTP or HTTPS --proxy. In
proxy. A pre proxy must be a SOCKS speaking proxy. 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 The pre proxy string should be specified with a protocol:// prefix to specify
alternative proxy protocols. Use socks4://, socks4a://, socks5:// or alternative proxy protocols. Use socks4://, socks4a://, socks5:// or

8
docs/cmdline-opts/socks4.d
View File

@ -6,12 +6,14 @@ Added: 7.15.2
Use the specified SOCKS4 proxy. If the port number is not specified, it is Use the specified SOCKS4 proxy. If the port number is not specified, it is
assumed at port 1080. 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 socks4 proxy Since 7.21.7, this option is superfluous since you can specify a socks4 proxy
with --proxy using a socks4:// protocol prefix. with --proxy using a socks4:// protocol prefix.
This option typically overrides any previous use of --proxy; however since Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time
7.52.0 if --proxy is used to specify an HTTP or HTTPS proxy then curl will --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to
attempt to use it with the SOCKS proxy. In such a case curl first connects to
the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. 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. If this option is used several times, the last one will be used.

8
docs/cmdline-opts/socks4a.d
View File

@ -6,12 +6,14 @@ Added: 7.18.0
Use the specified SOCKS4a proxy. If the port number is not specified, it is Use the specified SOCKS4a proxy. If the port number is not specified, it is
assumed at port 1080. 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 Since 7.21.7, this option is superfluous since you can specify a socks4a proxy
with --proxy using a socks4a:// protocol prefix. with --proxy using a socks4a:// protocol prefix.
This option typically overrides any previous use of --proxy; however since Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time
7.52.0 if --proxy is used to specify an HTTP or HTTPS proxy then curl will --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to
attempt to use it with the SOCKS proxy. In such a case curl first connects to
the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. 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. If this option is used several times, the last one will be used.

8
docs/cmdline-opts/socks5-hostname.d
View File

@ -6,12 +6,14 @@ Added: 7.18.0
Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If
the port number is not specified, it is assumed at port 1080. 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 socks5 Since 7.21.7, this option is superfluous since you can specify a socks5
hostname proxy with --proxy using a socks5h:// protocol prefix. hostname proxy with --proxy using a socks5h:// protocol prefix.
This option typically overrides any previous use of --proxy; however since Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time
7.52.0 if --proxy is used to specify an HTTP or HTTPS proxy then curl will --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to
attempt to use it with the SOCKS proxy. In such a case curl first connects to
the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. 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. If this option is used several times, the last one will be used.

8
docs/cmdline-opts/socks5.d
View File

@ -6,12 +6,14 @@ Added: 7.18.0
Use the specified SOCKS5 proxy - but resolve the host name locally. If the Use the specified SOCKS5 proxy - but resolve the host name locally. If the
port number is not specified, it is assumed at port 1080. 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 socks5 proxy Since 7.21.7, this option is superfluous since you can specify a socks5 proxy
with --proxy using a socks5:// protocol prefix. with --proxy using a socks5:// protocol prefix.
This option typically overrides any previous use of --proxy; however since Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time
7.52.0 if --proxy is used to specify an HTTP or HTTPS proxy then curl will --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to
attempt to use it with the SOCKS proxy. In such a case curl first connects to
the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. 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. If this option is used several times, the last one will be used.