diff options
| author | Jes Cok <xigua67damn@gmail.com> | 2024-09-09 16:26:41 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-09-10 19:59:02 +0000 |
| commit | 77e42fdeaf98d241dc09f4eb92e09225aea8f4c3 (patch) | |
| tree | 99f425882051169d8f58ba4651533c72b3188a1e /src/net/http | |
| parent | af0c40311e2ee33ecd24971257606f42a49cf593 (diff) | |
| download | go-77e42fdeaf98d241dc09f4eb92e09225aea8f4c3.tar.xz | |
net/http: make use of maps.Clone for Transport.{Clone, RegisterProtocol}
Not a big deal, maybe it's a bit clearer that it's cloning a map.
Change-Id: I7c85382a01df97d1f58109b2483061e6decdf03a
GitHub-Last-Rev: 7a88af7f56ab7ad017081187e226e901752fa8bc
GitHub-Pull-Request: golang/go#69357
Reviewed-on: https://go-review.googlesource.com/c/go/+/612015
Auto-Submit: Damien Neil <dneil@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/transport.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/net/http/transport.go b/src/net/http/transport.go index 26900620f1..ed7c2a52c2 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -20,6 +20,7 @@ import ( "internal/godebug" "io" "log" + "maps" "net" "net/http/httptrace" "net/http/internal/ascii" @@ -349,9 +350,9 @@ func (t *Transport) Clone() *Transport { *t2.HTTP2 = *t.HTTP2 } if !t.tlsNextProtoWasNil { - npm := map[string]func(authority string, c *tls.Conn) RoundTripper{} - for k, v := range t.TLSNextProto { - npm[k] = v + npm := maps.Clone(t.TLSNextProto) + if npm == nil { + npm = make(map[string]func(authority string, c *tls.Conn) RoundTripper) } t2.TLSNextProto = npm } @@ -830,9 +831,9 @@ func (t *Transport) RegisterProtocol(scheme string, rt RoundTripper) { if _, exists := oldMap[scheme]; exists { panic("protocol " + scheme + " already registered") } - newMap := make(map[string]RoundTripper) - for k, v := range oldMap { - newMap[k] = v + newMap := maps.Clone(oldMap) + if newMap == nil { + newMap = make(map[string]RoundTripper) } newMap[scheme] = rt t.altProto.Store(newMap) |