diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-01-05 22:04:18 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-01-05 22:04:18 +0000 |
| commit | b4305764367f24f06ce7dedc557d90772a00eec1 (patch) | |
| tree | d723ad3a4b96f6d4bb810e5853de764f83da99da /docs | |
| parent | 65008a4e55db71cff22e3fca6b36f15eb642b92d (diff) | |
Based on further discussion on curl-library, I reverted yesterday's SOCKS5
code to instead introduce support for a new proxy type called
CURLPROXY_SOCKS5_HOSTNAME that is used to send the host name to the proxy
instead of IP address and there's thus no longer any need for a new
curl_easy_setopt() option.
The default SOCKS5 proxy is again back to sending the IP address to the
proxy. The new curl command line option for enabling sending host name to a
SOCKS5 proxy is now --socks5-hostname.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/curl.1 | 10 | ||||
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index 731c945db..43d43500f 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -21,7 +21,7 @@ .\" * $Id$ .\" ************************************************************************** .\" -.TH curl 1 "20 Nov 2007" "Curl 7.17.2" "Curl Manual" +.TH curl 1 "5 Jan 2008" "Curl 7.17.2" "Curl Manual" .SH NAME curl \- transfer a URL .SH SYNOPSIS @@ -1083,10 +1083,10 @@ 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. -.IP "--socks5 <host[:port]>" +.IP "--socks5-hostname <host[:port]>" 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) +7.17.2) This option overrides any previous use of \fI-x/--proxy\fP, as they are mutually exclusive. @@ -1094,9 +1094,9 @@ 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]>" +.IP "--socks5 <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) +port number is not specified, it is assumed at port 1080. This option overrides any previous use of \fI-x/--proxy\fP, as they are mutually exclusive. diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 299ac3ebb..05289e9de 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -21,7 +21,7 @@ .\" * $Id$ .\" ************************************************************************** .\" -.TH curl_easy_setopt 3 "4 Jan 2008" "libcurl 7.17.2" "libcurl Manual" +.TH curl_easy_setopt 3 "5 Jan 2008" "libcurl 7.17.2" "libcurl Manual" .SH NAME curl_easy_setopt \- set options for a curl easy handle .SH SYNOPSIS @@ -431,10 +431,9 @@ specified in the proxy string \fICURLOPT_PROXY\fP. .IP CURLOPT_PROXYTYPE Pass a long with this option to set type of the proxy. Available options for this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_SOCKS4\fP (added in 7.15.2), -\fICURLPROXY_SOCKS5\fP and \fICURLPROXY_SOCKS4A\fP (added in 7.17.2). The HTTP -type is default. (Added in 7.10) - -See also \fIURLOPT_SOCKS5_RESOLVE_LOCAL\fP. +\fICURLPROXY_SOCKS5\fP, \fICURLPROXY_SOCKS4A\fP (added in 7.17.2) and +\fICURLPROXY_SOCKS5_HOSTNAME\fP (added in 7.17.2). The HTTP type is +default. (Added in 7.10) .IP CURLOPT_HTTPPROXYTUNNEL Set the parameter to non-zero to get the library to tunnel all operations through a given HTTP proxy. There is a big difference between using a proxy |