mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #41508 from thaJeztah/header_handling
client: use canonical names for HTTP Headers
This commit is contained in:
commit
a7e27dd1a8
1 changed files with 2 additions and 2 deletions
|
@ -238,14 +238,14 @@ func (cli *Client) addHeaders(req *http.Request, headers headers) *http.Request
|
||||||
// Add CLI Config's HTTP Headers BEFORE we set the Docker headers
|
// Add CLI Config's HTTP Headers BEFORE we set the Docker headers
|
||||||
// then the user can't change OUR headers
|
// then the user can't change OUR headers
|
||||||
for k, v := range cli.customHTTPHeaders {
|
for k, v := range cli.customHTTPHeaders {
|
||||||
if versions.LessThan(cli.version, "1.25") && k == "User-Agent" {
|
if versions.LessThan(cli.version, "1.25") && http.CanonicalHeaderKey(k) == "User-Agent" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
req.Header.Set(k, v)
|
req.Header.Set(k, v)
|
||||||
}
|
}
|
||||||
|
|
||||||
for k, v := range headers {
|
for k, v := range headers {
|
||||||
req.Header[k] = v
|
req.Header[http.CanonicalHeaderKey(k)] = v
|
||||||
}
|
}
|
||||||
return req
|
return req
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue