Change http.Header copy to builtin Clone

djdongjin · djdongjin · commit b5784af662f7 · 2023-07-10T12:34:42.000-07:00
Signed-off-by: Jin Dong <djdongjin95@gmail.com> (cherry picked from commit 83ff030) Signed-off-by: Jin Dong <jin.dong@databricks.com>
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -149,7 +149,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)
 	}
@@ -538,9 +537,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
`@@ -149,7 +149,6 @@ func NewResolver(options ResolverOptions) remotes.Resolver {`
`149`	`149`	`// make a copy of the headers to avoid race due to concurrent map write`
`150`	`150`	`options.Headers = options.Headers.Clone()`
`151`	`151`	`}`
`152`		`-`
`153`	`152`	`if _, ok := options.Headers["User-Agent"]; !ok {`
`154`	`153`	`options.Headers.Set("User-Agent", "containerd/"+version.Version)`
`155`	`154`	`}`
`@@ -538,9 +537,10 @@ func (r request) do(ctx context.Context) (http.Response, error) {`
`538`	`537`	`if err != nil {`
`539`	`538`	`return nil, err`
`540`	`539`	`}`
`541`		`- req.Header = http.Header{} // headers need to be copied to avoid concurrent map access`
`542`		`- for k, v := range r.header {`
`543`		`- req.Header[k] = v`
	`540`	`+ if r.header == nil {`
	`541`	`+ req.Header = http.Header{}`
	`542`	`+ } else {`
	`543`	`+ req.Header = r.header.Clone() // headers need to be copied to avoid concurrent map access`
`544`	`544`	`}`
`545`	`545`	`if r.body != nil {`
`546`	`546`	`body, err := r.body()`