Change http.Header copy to builtin Clone

djdongjin · djdongjin · commit 83ff030e4f01 · 2023-07-08T05:25:47.000-07:00
Signed-off-by: Jin Dong &lt;djdongjin95@gmail.com&gt;
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -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)
 	}
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,6 @@ func NewResolver(options ResolverOptions) remotes.Resolver {`
`152`	`152`	`// make a copy of the headers to avoid race due to concurrent map write`
`153`	`153`	`options.Headers = options.Headers.Clone()`
`154`	`154`	`}`
`155`		`-`
`156`	`155`	`if _, ok := options.Headers["User-Agent"]; !ok {`
`157`	`156`	`options.Headers.Set("User-Agent", "containerd/"+version.Version)`
`158`	`157`	`}`
`@@ -547,9 +546,10 @@ func (r request) do(ctx context.Context) (http.Response, error) {`
`547`	`546`	`if err != nil {`
`548`	`547`	`return nil, err`
`549`	`548`	`}`
`550`		`- req.Header = http.Header{} // headers need to be copied to avoid concurrent map access`
`551`		`- for k, v := range r.header {`
`552`		`- req.Header[k] = v`
	`549`	`+ if r.header == nil {`
	`550`	`+ req.Header = http.Header{}`
	`551`	`+ } else {`
	`552`	`+ req.Header = r.header.Clone() // headers need to be copied to avoid concurrent map access`
`553`	`553`	`}`
`554`	`554`	`if r.body != nil {`
`555`	`555`	`body, err := r.body()`