diff options
| author | Elliott Hughes <enh@google.com> | 2017-09-20 17:00:17 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-09-21 09:38:15 -0700 |
| commit | 82be86df6ec7baa34d6169c053fd1dfe56fa858e (patch) | |
| tree | afd04b931f1f59dfe81b0daa450306ff0204319b /docs/cmdline-opts/socks4a.d | |
| parent | bfa505f61d33429f40bf843b7871fc793dd017d4 (diff) | |
| download | external_curl-82be86df6ec7baa34d6169c053fd1dfe56fa858e.tar.gz external_curl-82be86df6ec7baa34d6169c053fd1dfe56fa858e.tar.bz2 external_curl-82be86df6ec7baa34d6169c053fd1dfe56fa858e.zip | |
Update libcurl from 7.54.1 to 7.55.1.
Bug: http://b/64610131
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: I7ecaf9c83e9496ac4a379507791bec637deaa4cb
Diffstat (limited to 'docs/cmdline-opts/socks4a.d')
| -rw-r--r-- | docs/cmdline-opts/socks4a.d | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/docs/cmdline-opts/socks4a.d b/docs/cmdline-opts/socks4a.d new file mode 100644 index 00000000..ae254ae0 --- /dev/null +++ b/docs/cmdline-opts/socks4a.d @@ -0,0 +1,19 @@ +Long: socks4a +Arg: <host[:port]> +Help: SOCKS4a proxy on given host + port +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. + +Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time +--proxy is used with an HTTP/HTTPS 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. |