diff options
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/httptest/server.go | 5 | ||||
| -rw-r--r-- | src/net/http/transport.go | 25 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/net/http/httptest/server.go b/src/net/http/httptest/server.go index 8608077bd1..e67b7145be 100644 --- a/src/net/http/httptest/server.go +++ b/src/net/http/httptest/server.go @@ -114,9 +114,10 @@ func (s *Server) StartTLS() { } existingConfig := s.TLS - s.TLS = new(tls.Config) if existingConfig != nil { - *s.TLS = *existingConfig + s.TLS = existingConfig.Clone() + } else { + s.TLS = new(tls.Config) } if s.TLS.NextProtos == nil { s.TLS.NextProtos = []string{"http/1.1"} diff --git a/src/net/http/transport.go b/src/net/http/transport.go index 65465e25c1..44e29c642f 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -2087,30 +2087,7 @@ func cloneTLSConfig(cfg *tls.Config) *tls.Config { if cfg == nil { return &tls.Config{} } - return &tls.Config{ - Rand: cfg.Rand, - Time: cfg.Time, - Certificates: cfg.Certificates, - NameToCertificate: cfg.NameToCertificate, - GetCertificate: cfg.GetCertificate, - RootCAs: cfg.RootCAs, - NextProtos: cfg.NextProtos, - ServerName: cfg.ServerName, - ClientAuth: cfg.ClientAuth, - ClientCAs: cfg.ClientCAs, - InsecureSkipVerify: cfg.InsecureSkipVerify, - CipherSuites: cfg.CipherSuites, - PreferServerCipherSuites: cfg.PreferServerCipherSuites, - SessionTicketsDisabled: cfg.SessionTicketsDisabled, - SessionTicketKey: cfg.SessionTicketKey, - ClientSessionCache: cfg.ClientSessionCache, - MinVersion: cfg.MinVersion, - MaxVersion: cfg.MaxVersion, - CurvePreferences: cfg.CurvePreferences, - DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled, - Renegotiation: cfg.Renegotiation, - KeyLogWriter: cfg.KeyLogWriter, - } + return cfg.Clone() } // cloneTLSClientConfig is like cloneTLSConfig but omits |