diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/curl.1 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index b54bdbc1a..6d08c50b0 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -1651,8 +1651,16 @@ to follow location: headers. If this option is used several times, the last one will be used. .IP "-x, --proxy <[protocol://][user:password@]proxyhost[:port]>" -Use the specified HTTP proxy. If the port number is not specified, it is -assumed at port 1080. +Use the specified proxy. + +The proxy string can be specified with a protocol:// prefix to specify +alternative proxy protocols. Use socks4://, socks4a://, socks5:// or +socks5h:// to request the specific SOCKS version to be used. No protocol +specified, http:// and all others will be treated as HTTP proxies. (The +protocol support was added in curl 7.21.7) + +If the port number is not specified in the proxy string, it is assumed to be +1080. This option overrides existing environment variables that set the proxy to use. If there's an environment variable setting a proxy, you can set proxy to @@ -1671,11 +1679,6 @@ The proxy host can be specified the exact same way as the proxy environment variables, including the protocol prefix (http://) and the embedded user + password. -From 7.21.7, the proxy string may be specified with a protocol:// prefix to -specify alternative proxy protocols. Use socks4://, socks4a://, socks5:// or -socks5h:// to request the specific SOCKS version to be used. No protocol -specified, http:// and all others will be treated as HTTP proxies. - If this option is used several times, the last one will be used. .IP "-X, --request <command>" (HTTP) Specifies a custom request method to use when communicating with the |