diff options
author | Jay Satiro <raysatiro@yahoo.com> | 2017-02-06 03:13:42 -0500 |
---|---|---|
committer | Jay Satiro <raysatiro@yahoo.com> | 2017-02-06 03:13:42 -0500 |
commit | 423a93ce32215c9854b0b077aeb5ea723a1f0f63 (patch) | |
tree | e233a0130e1e51eb23a7db6ab3a14945d135866c /docs/cmdline-opts/socks4a.d | |
parent | a49d2d0e25b5441e34ae29dcd18f2658a951eace (diff) |
docs: Add more HTTPS proxy documentation
- Document HTTPS proxy type.
- Document --write-out %{proxy_ssl_verify_result}.
- Document SOCKS proxy + HTTP/HTTPS proxy combination.
HTTPS proxy support was added in 7.52.0 for OpenSSL, GnuTLS and NSS.
Ref: https://github.com/curl/curl/commit/cb4e2be
Diffstat (limited to 'docs/cmdline-opts/socks4a.d')
-rw-r--r-- | docs/cmdline-opts/socks4a.d | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/cmdline-opts/socks4a.d b/docs/cmdline-opts/socks4a.d index a1db1f56a..c7663eebd 100644 --- a/docs/cmdline-opts/socks4a.d +++ b/docs/cmdline-opts/socks4a.d @@ -6,10 +6,12 @@ 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 +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. |