Skip to content

Commit

Permalink
Change http.Header copy to builtin Clone
Browse files Browse the repository at this point in the history
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
  • Loading branch information
djdongjin committed Jul 8, 2023
1 parent cdb153e commit 83ff030
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions remotes/docker/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ func NewResolver(options ResolverOptions) remotes.Resolver {
// make a copy of the headers to avoid race due to concurrent map write
options.Headers = options.Headers.Clone()
}

if _, ok := options.Headers["User-Agent"]; !ok {
options.Headers.Set("User-Agent", "containerd/"+version.Version)
}
Expand Down Expand Up @@ -547,9 +546,10 @@ func (r *request) do(ctx context.Context) (*http.Response, error) {
if err != nil {
return nil, err
}
req.Header = http.Header{} // headers need to be copied to avoid concurrent map access
for k, v := range r.header {
req.Header[k] = v
if r.header == nil {
req.Header = http.Header{}
} else {
req.Header = r.header.Clone() // headers need to be copied to avoid concurrent map access
}
if r.body != nil {
body, err := r.body()
Expand Down

0 comments on commit 83ff030

Please sign in to comment.