From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 20 Apr 2011 13:42:23 +0000 (+0200)
Subject: curl_easy_setopt.3: CURLOPT_PROXYTYPE clarification
X-Git-Tag: upstream/7.37.1~4160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6a0abdd975848dca03f93e7ff1dd4550bda7c0a;p=platform%2Fupstream%2Fcurl.git

curl_easy_setopt.3: CURLOPT_PROXYTYPE clarification

When set to a HTTP 1.0 proxy, that only affects the CONNECT request and
not the regular HTTP request.
---

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 7cfe29b..347c49a 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -641,6 +641,11 @@ 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)
+
+If you set \fBCURLOPT_PROXYTYPE\fP to \fICURLPROXY_HTTP_1_0\fP, it will only
+affect how libcurl speaks to a proxy when CONNECT is used. The HTTP version
+used for "regular" HTTP requests is instead controled with
+\fICURLOPT_HTTP_VERSION\fP.
 .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