docs: this is for 7.37.0

And clarify for curl that --proxy-header now must be used for headers
that are meant for a proxy, and they will not be included if the request
is not for a proxy.
This commit is contained in:
Daniel Stenberg 2014-04-04 17:08:28 +02:00
parent 74851340bd
commit 109e94c51c
2 changed files with 26 additions and 20 deletions

View File

@ -678,16 +678,16 @@ If this option is used several times, only the first one is used. This is
because undoing a GET doesn't make sense, but you should then instead enforce because undoing a GET doesn't make sense, but you should then instead enforce
the alternative method you prefer. the alternative method you prefer.
.IP "-H, --header <header>" .IP "-H, --header <header>"
(HTTP) Extra header to use when getting a web page. You may specify any number (HTTP) Extra header to include in the request when sending HTTP to a
of extra headers. Note that if you should add a custom header that has the server. You may specify any number of extra headers. Note that if you should
same name as one of the internal ones curl would use, your externally set add a custom header that has the same name as one of the internal ones curl
header will be used instead of the internal one. This allows you to make even would use, your externally set header will be used instead of the internal
trickier stuff than curl would normally do. You should not replace internally one. This allows you to make even trickier stuff than curl would normally
set headers without knowing perfectly well what you're doing. Remove an do. You should not replace internally set headers without knowing perfectly
internal header by giving a replacement without content on the right side of well what you're doing. Remove an internal header by giving a replacement
the colon, as in: -H \&"Host:". If you send the custom header with no-value without content on the right side of the colon, as in: -H \&"Host:". If you
then its header must be terminated with a semicolon, such as \-H send the custom header with no-value then its header must be terminated with a
\&"X-Custom-Header;" to send "X-Custom-Header:". semicolon, such as \-H \&"X-Custom-Header;" to send "X-Custom-Header:".
curl will make sure that each header you add/replace is sent with the proper curl will make sure that each header you add/replace is sent with the proper
end-of-line marker, you should thus \fBnot\fP add that as a part of the header end-of-line marker, you should thus \fBnot\fP add that as a part of the header
@ -696,6 +696,9 @@ for you.
See also the \fI-A, --user-agent\fP and \fI-e, --referer\fP options. See also the \fI-A, --user-agent\fP and \fI-e, --referer\fP options.
Starting in 7.37.0, you need \fI--proxy-header\fP to send custom headers
intended for a proxy.
This option can be used multiple times to add/replace/remove multiple headers. This option can be used multiple times to add/replace/remove multiple headers.
.IP "--hostpubmd5 <md5>" .IP "--hostpubmd5 <md5>"
(SCP/SFTP) Pass a string containing 32 hexadecimal digits. The string should (SCP/SFTP) Pass a string containing 32 hexadecimal digits. The string should
@ -1108,20 +1111,23 @@ The Bearer Token and user name are formatted according to RFC 6750.
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.
.IP "--proxy-header <header>" .IP "--proxy-header <header>"
(HTTP) Extra header to use when getting a web page with a proxy. You may (HTTP) Extra header to include in the request when sending HTTP to a
specify any number of extra headers. This is the equivalent option to \fI-H, proxy. You may specify any number of extra headers. This is the equivalent
--header\fP but is for proxy communication only like in CONNECT requests when option to \fI-H, --header\fP but is for proxy communication only like in
you want a separate header sent to the proxy to what is sent to the actual CONNECT requests when you want a separate header sent to the proxy to what is
remote host. sent to the actual remote host.
curl will make sure that each header you add/replace is sent with the proper curl will make sure that each header you add/replace is sent with the proper
end-of-line marker, you should thus \fBnot\fP add that as a part of the header end-of-line marker, you should thus \fBnot\fP add that as a part of the header
content: do not add newlines or carriage returns, they will only mess things content: do not add newlines or carriage returns, they will only mess things
up for you. up for you.
Headers specified with this option will not be included in requests that curl
knows will not be sent to a proxy.
This option can be used multiple times to add/replace/remove multiple headers. This option can be used multiple times to add/replace/remove multiple headers.
(Added in 7.36.0) (Added in 7.37.0)
.IP "-p, --proxytunnel" .IP "-p, --proxytunnel"
When an HTTP proxy is used (\fI-x, --proxy\fP), this option will cause non-HTTP 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 protocols to attempt to tunnel through the proxy instead of merely using it to

View File

@ -193,8 +193,8 @@ CURLFTP_CREATE_DIR_RETRY 7.19.4
CURLGSSAPI_DELEGATION_FLAG 7.22.0 CURLGSSAPI_DELEGATION_FLAG 7.22.0
CURLGSSAPI_DELEGATION_NONE 7.22.0 CURLGSSAPI_DELEGATION_NONE 7.22.0
CURLGSSAPI_DELEGATION_POLICY_FLAG 7.22.0 CURLGSSAPI_DELEGATION_POLICY_FLAG 7.22.0
CURLHEADER_SEPARATE 7.36.0 CURLHEADER_SEPARATE 7.37.0
CURLHEADER_UNIFIED 7.36.0 CURLHEADER_UNIFIED 7.37.0
CURLINFO_APPCONNECT_TIME 7.19.0 CURLINFO_APPCONNECT_TIME 7.19.0
CURLINFO_CERTINFO 7.19.1 CURLINFO_CERTINFO 7.19.1
CURLINFO_CONDITION_UNMET 7.19.4 CURLINFO_CONDITION_UNMET 7.19.4
@ -372,7 +372,7 @@ CURLOPT_GSSAPI_DELEGATION 7.22.0
CURLOPT_HEADER 7.1 CURLOPT_HEADER 7.1
CURLOPT_HEADERDATA 7.10 CURLOPT_HEADERDATA 7.10
CURLOPT_HEADERFUNCTION 7.7.2 CURLOPT_HEADERFUNCTION 7.7.2
CURLOPT_HEADEROPT 7.36.0 CURLOPT_HEADEROPT 7.37.0
CURLOPT_HTTP200ALIASES 7.10.3 CURLOPT_HTTP200ALIASES 7.10.3
CURLOPT_HTTPAUTH 7.10.6 CURLOPT_HTTPAUTH 7.10.6
CURLOPT_HTTPGET 7.8.1 CURLOPT_HTTPGET 7.8.1
@ -442,7 +442,7 @@ CURLOPT_PROGRESSFUNCTION 7.1 7.32.0
CURLOPT_PROTOCOLS 7.19.4 CURLOPT_PROTOCOLS 7.19.4
CURLOPT_PROXY 7.1 CURLOPT_PROXY 7.1
CURLOPT_PROXYAUTH 7.10.7 CURLOPT_PROXYAUTH 7.10.7
CURLOPT_PROXYHEADER 7.36.0 CURLOPT_PROXYHEADER 7.37.0
CURLOPT_PROXYPASSWORD 7.19.1 CURLOPT_PROXYPASSWORD 7.19.1
CURLOPT_PROXYPORT 7.1 CURLOPT_PROXYPORT 7.1
CURLOPT_PROXYTYPE 7.10 CURLOPT_PROXYTYPE 7.10