aboutsummaryrefslogtreecommitdiff
path: root/docs/libcurl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-05-02 22:15:14 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-05-02 22:15:14 +0200
commitd4ebf3c6b0951dcec2157feb6e064ee636cd919b (patch)
tree9104c505e2e8e2f2c91dab191e7e254535526d67 /docs/libcurl
parentf78fa6a57d53db9b0ee2141394c28ca2d86cc958 (diff)
docs: mention the protocol:// support in proxy strings
Diffstat (limited to 'docs/libcurl')
-rw-r--r--docs/libcurl/curl_easy_setopt.35
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 347c49ad3..4522181b1 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -632,6 +632,11 @@ use of a proxy, even if there is an environment variable set for it.
Since 7.14.1, the proxy host string given in environment variables can be
specified the exact same way as the proxy can be set with \fICURLOPT_PROXY\fP,
include protocol prefix (http://) and embedded user + password.
+
+Since 7.21.7, the proxy string may be specified with a protocol:// prefix to
+specify alternative proxy protocols. Use socks4://, socks4a:// or socks5:// to
+request the specific SOCKS version to be used. No protocol specified, http://
+and all others will be treated as HTTP proxies.
.IP CURLOPT_PROXYPORT
Pass a long with this option to set the proxy port to connect to unless it is
specified in the proxy string \fICURLOPT_PROXY\fP.