diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/curl.1 | 16 | ||||
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index 52949c34f..d84d42cc6 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -21,7 +21,7 @@ .\" * $Id$ .\" ************************************************************************** .\" -.TH curl 1 "24 Nov 2005" "Curl 7.15.1" "Curl Manual" +.TH curl 1 "21 Feb 2006" "Curl 7.15.2" "Curl Manual" .SH NAME curl \- transfer a URL .SH SYNOPSIS @@ -859,14 +859,24 @@ If this option is used twice, the second will again disable silent mode. When used with -s it makes curl show error message if it fails. If this option is used twice, the second will again disable show error. -.IP "--socks <host[:port]>" +.IP "--socks4 <host[:port]>" +Use the specified SOCKS4 proxy. If the port number is not specified, it is +assumed at port 1080. (Added in 7.15.2) + +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]>" Use the specified SOCKS5 proxy. 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. +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 "--stderr <file>" Redirect all writes to stderr to the specified file instead. If the file name is a plain '-', it is instead written to stdout. This option has no point when diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 8a152947c..5db673eb2 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 "28 Jan 2006" "libcurl 7.15.2" "libcurl Manual" +.TH curl_easy_setopt 3 "21 Feb 2006" "libcurl 7.15.2" "libcurl Manual" .SH NAME curl_easy_setopt \- set options for a curl easy handle .SH SYNOPSIS @@ -324,8 +324,8 @@ 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. .IP CURLOPT_PROXYTYPE Pass a long with this option to set type of the proxy. Available options for -this are \fICURLPROXY_HTTP\fP and \fICURLPROXY_SOCKS5\fP, with the HTTP one -being default. (Added in 7.10) +this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_SOCKS4\fP (added in 7.15.2) +\fICURLPROXY_SOCKS5\fP. 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 |