aboutsummaryrefslogtreecommitdiff
path: root/docs/cmdline-opts/socks4.d
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2017-02-06 03:13:42 -0500
committerJay Satiro <raysatiro@yahoo.com>2017-02-06 03:13:42 -0500
commit423a93ce32215c9854b0b077aeb5ea723a1f0f63 (patch)
treee233a0130e1e51eb23a7db6ab3a14945d135866c /docs/cmdline-opts/socks4.d
parenta49d2d0e25b5441e34ae29dcd18f2658a951eace (diff)
downloadgnurl-423a93ce32215c9854b0b077aeb5ea723a1f0f63.tar.gz
gnurl-423a93ce32215c9854b0b077aeb5ea723a1f0f63.tar.bz2
gnurl-423a93ce32215c9854b0b077aeb5ea723a1f0f63.zip
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/socks4.d')
-rw-r--r--docs/cmdline-opts/socks4.d8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/cmdline-opts/socks4.d b/docs/cmdline-opts/socks4.d
index ab4536af3..46354408e 100644
--- a/docs/cmdline-opts/socks4.d
+++ b/docs/cmdline-opts/socks4.d
@@ -6,10 +6,12 @@ Added: 7.15.2
Use the specified SOCKS4 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 socks4 proxy
with --proxy using a socks4:// 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.