diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-01-04 23:01:00 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-01-04 23:01:00 +0000 |
| commit | 2e42b0a252416803a90ea232dc94a0a21d5a97e5 (patch) | |
| tree | ce5c9b3a2e33408a77300563964924a73d6b464b /docs/curl.1 | |
| parent | fcc485092a09811d5bfed78d13984fed5c31e652 (diff) | |
Based on Maxim Perenesenko's patch, we now do SOCKS5 operations and let the
proxy do the host name resolving and only if --socks5ip (or
CURLOPT_SOCKS5_RESOLVE_LOCAL) is used we resolve the host name locally and
pass on the IP address only to the proxy.
Diffstat (limited to 'docs/curl.1')
| -rw-r--r-- | docs/curl.1 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index b94a1dc54..731c945db 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -1084,8 +1084,19 @@ mutually exclusive. If this option is used several times, the last one will be used. .IP "--socks5 <host[:port]>" -Use the specified SOCKS5 proxy. If the port number is not specified, it is -assumed at port 1080. (Added in 7.11.1) +Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If +the port number is not specified, it is assumed at port 1080. (Added in +7.11.1) + +This option overrides any previous use of \fI-x/--proxy\fP, as they are +mutually exclusive. + +If this option is used several times, the last one will be used. (This option +was previously wrongly documented and used as --socks without the number +appended.) +.IP "--socks5ip <host[:port]>" +Use the specified SOCKS5 proxy - but resolve the host name locally. If the +port number is not specified, it is assumed at port 1080. (Added in 7.17.2) This option overrides any previous use of \fI-x/--proxy\fP, as they are mutually exclusive. |