github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Change http.Header copy to builtin Clone

Browse Source 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
This commit is contained in:
Jin Dong 2023-06-28 16:34:13 +00:00 committed by Jin Dong
parent cdb153ec92
commit 83ff030e4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
remotes/docker/resolver.go
View File

@ -152,7 +152,6 @@ func NewResolver(options ResolverOptions) remotes.Resolver {
// make a copy of the headers to avoid race due to concurrent map write // make a copy of the headers to avoid race due to concurrent map write
options.Headers = options.Headers.Clone() options.Headers = options.Headers.Clone()
} }
if _, ok := options.Headers["User-Agent"]; !ok { if _, ok := options.Headers["User-Agent"]; !ok {
options.Headers.Set("User-Agent", "containerd/"+version.Version) options.Headers.Set("User-Agent", "containerd/"+version.Version)
} }
@ -547,9 +546,10 @@ func (r *request) do(ctx context.Context) (*http.Response, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Header = http.Header{} // headers need to be copied to avoid concurrent map access if r.header == nil {
for k, v := range r.header { req.Header = http.Header{}
req.Header[k] = v } else {
req.Header = r.header.Clone() // headers need to be copied to avoid concurrent map access
} }
if r.body != nil { if r.body != nil {
body, err := r.body() body, err := r.body()