diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-02-20 17:10:00 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-04-04 17:03:43 +0200 |
| commit | 74851340bd7b4edbdc749e74562fc1ebcef9930f (patch) | |
| tree | 5648f921a7e79ffea2f7deb32188d3ad2ca8d3a5 /docs/libcurl/curl_easy_setopt.3 | |
| parent | d3d27551e716e4899ef8fea7ac416f1d6c654f96 (diff) | |
PROXYHEADER: send these headers in "normal" proxy requests too
Updated the docs to clarify and the code accordingly, with test 1528 to
verify:
When CURLHEADER_SEPARATE is set and libcurl is asked to send a request
to a proxy but it isn't CONNECT, then _both_ header lists
(CURLOPT_HTTPHEADER and CURLOPT_PROXYHEADER) will be used since the
single request is then made for both the proxy and the server.
Diffstat (limited to 'docs/libcurl/curl_easy_setopt.3')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 40c5a01c7..a3f12d82d 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -1549,19 +1549,19 @@ There's an alternative option that sets or replaces headers only for requests that are sent with CONNECT to a proxy: \fICURLOPT_PROXYHEADER\fP. Use \fICURLOPT_HEADEROPT\fP to control the behavior. .IP CURLOPT_HEADEROPT -Pass a long that is a bitmask of options of how to deal with headers. The -available options are: +Pass a long that is a bitmask of options of how to deal with headers. The two +mutually exclusive options are: CURLHEADER_UNIFIED - keep working as before. This means CURLOPT_HTTPHEADER -headers will be used in requests both to servers and in CONNECT requests. With -this option enabled, \fICURLOPT_PROXYHEADER\fP will not have any effect. +headers will be used in requests both to servers and proxies. With this option +enabled, \fICURLOPT_PROXYHEADER\fP will not have any effect. CURLHEADER_SEPARATE - makes \fICURLOPT_HTTPHEADER\fP headers only get sent to -a host and not to a proxy if CONNECT is being used. It has to be set to make -\fICURLOPT_PROXYHEADER\fP get used. - -This behavior is set per request and an application can alter it between -different invokes if desired. +a server and not to a proxy. Proxy headers must be set with +\fICURLOPT_PROXYHEADER\fP to get used. Note that if a non-CONNECT request is +sent to a proxy, libcurl will send both server headers and proxy headers. When +doing CONNECT, libcurl will send \fICURLOPT_PROXYHEADER\fP headers only do the +proxy and then \fICURLOPT_HTTPHEADER\fP headers only to the server. (Added in 7.36.0) .IP CURLOPT_PROXYHEADER |