diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-02-02 16:19:23 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-02-02 16:19:23 +0000 |
| commit | bdd4294e79eea15cb6f312f7ee7d388ad40a65e3 (patch) | |
| tree | bfd4285bac21f3c71ad770df722bf87ed0d14c42 /docs | |
| parent | dcf92bffd2a22909a44b45bd7490e2575e14f82c (diff) | |
- Craig A West brought us: libcurl now defaults to do CONNECT with HTTP
version 1.1 instead of 1.0 like before. This change also introduces the new
proxy type for libcurl called 'CURLPROXY_HTTP_1_0' that then allows apps to
switch (back) to CONNECT 1.0 requests. The curl tool also got a --proxy1.0
option that works exactly like --proxy but sets CURLPROXY_HTTP_1_0.
I updated all test cases cases that use CONNECT and I tried to do some using
--proxy1.0 and some updated to do CONNECT 1.1 to get both versions run.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/MANUAL | 3 | ||||
| -rw-r--r-- | docs/curl.1 | 7 | ||||
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/docs/MANUAL b/docs/MANUAL index de2bdd280..417befb37 100644 --- a/docs/MANUAL +++ b/docs/MANUAL @@ -141,6 +141,9 @@ PROXY curl --noproxy localhost,get.this -x my-proxy:888 http://www.get.this/ + If the proxy is specified with --proxy1.0 instead of --proxy or -x, then + curl will use HTTP/1.0 instead of HTTP/1.1 for any CONNECT attempts. + curl also supports SOCKS4 and SOCKS5 proxies with --socks4 and --socks5. See also the environment variables Curl support that offer further proxy diff --git a/docs/curl.1 b/docs/curl.1 index c7bc972b6..6eef693b1 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -903,6 +903,13 @@ with a remote host. (Added in 7.17.1) .IP "--proxy-ntlm" Tells curl to use HTTP NTLM authentication when communicating with the given proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host. +.IP "--proxy1.0 <proxyhost[:port]>" +Use the specified HTTP 1.0 proxy. If the port number is not specified, it is +assumed at port 1080. + +The only difference between this and the HTTP proxy option (\fI-x/--proxy\fP), +is that attempts to use CONNECT through the proxy will specify an HTTP 1.0 +protocol instead of the default HTTP 1.1. .IP "-p/--proxytunnel" When an HTTP proxy is used (\fI-x/--proxy\fP), this option will cause non-HTTP protocols to attempt to tunnel through the proxy instead of merely using it to diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index c6e6013b5..579016bb7 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -470,10 +470,10 @@ 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, \fICURLPROXY_SOCKS4\fP (added in 7.15.2), -\fICURLPROXY_SOCKS5\fP, \fICURLPROXY_SOCKS4A\fP (added in 7.18.0) and -\fICURLPROXY_SOCKS5_HOSTNAME\fP (added in 7.18.0). The HTTP type is -default. (Added in 7.10) +this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_HTTP_1_0\fP (added in 7.19.4), +\fICURLPROXY_SOCKS4\fP (added in 7.15.2), \fICURLPROXY_SOCKS5\fP, +\fICURLPROXY_SOCKS4A\fP (added in 7.18.0) and \fICURLPROXY_SOCKS5_HOSTNAME\fP +(added in 7.18.0). The HTTP type is default. (Added in 7.10) .IP CURLOPT_NOPROXY Pass a pointer to a zero terminated string. The should be a comma- separated list of hosts which do not use a proxy, if one is specified. The only |