vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

On redirect, only copy headers when they don't already exist in the redirected request

Browse source 
A changeset under consideration for Go 1.7 would automatically copy
headers on redirect. This change future-proofs our code so we won't make
duplicate copies of the headers if net/http does it automatically in the
future.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2016-02-03 13:19:44 -08:00
parent c149d45cc8
commit 4354f0a107
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
registry/client/repository.go
View file

@ -36,8 +36,21 @@ func checkHTTPRedirect(req *http.Request, via []*http.Request) error {
if len(via) > 0 { if len(via) > 0 {
for headerName, headerVals := range via[0].Header { for headerName, headerVals := range via[0].Header {
if headerName == "Accept" || headerName == "Range" { if headerName != "Accept" && headerName != "Range" {
for _, val := range headerVals { continue
}
for _, val := range headerVals {
// Don't add to redirected request if redirected
// request already has a header with the same
// name and value.
hasValue := false
for _, existingVal := range req.Header[headerName] {
if existingVal == val {
hasValue = true
break
}
}
if !hasValue {
req.Header.Add(headerName, val) req.Header.Add(headerName, val)
} }
} }