MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 03:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove redirectHeaders method (#5120)

Browse Source 
As of go 1.8, headers are copied on redirect, so we no longer need
to do this manually.

See https://github.com/golang/go/issues/4800 and
https://go-review.googlesource.com/c/go/+/28930 for more context on go
behaviour.

Fixes #5042
This commit is contained in:
Nitish Tiwari 2017-11-01 12:43:13 +05:30 committed by GitHub
parent 32c6b62932
commit 34a1b58a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/madmin/api.go
View File

@ -91,18 +91,6 @@ func New(endpoint string, accessKeyID, secretAccessKey string, secure bool) (*Ad
return clnt, nil return clnt, nil
} }
// redirectHeaders copies all headers when following a redirect URL.
// This won't be needed anymore from go 1.8 (https://github.com/golang/go/issues/4800)
func redirectHeaders(req *http.Request, via []*http.Request) error {
if len(via) == 0 {
return nil
}
for key, val := range via[0].Header {
req.Header[key] = val
}
return nil
}
func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*AdminClient, error) { func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*AdminClient, error) {
// construct endpoint. // construct endpoint.
endpointURL, err := getEndpointURL(endpoint, secure) endpointURL, err := getEndpointURL(endpoint, secure)
@ -120,8 +108,7 @@ func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Ad
endpointURL: *endpointURL, endpointURL: *endpointURL,
// Instantiate http client and bucket location cache. // Instantiate http client and bucket location cache.
httpClient: &http.Client{ httpClient: &http.Client{
Transport: http.DefaultTransport, Transport: http.DefaultTransport,
CheckRedirect: redirectHeaders,
}, },
} }