]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: also clone DynamicRecordSizingDisabled in cloneTLSConfig
authorBrad Fitzpatrick <bradfitz@golang.org>
Fri, 20 May 2016 16:30:49 +0000 (16:30 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Fri, 20 May 2016 17:10:18 +0000 (17:10 +0000)
Updates #15771

Change-Id: I5dad96bdca19d680dd00cbd17b72a03e43eb557e
Reviewed-on: https://go-review.googlesource.com/23283
Reviewed-by: Tom Bergan <tombergan@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>

src/net/http/transport.go

index 37fa7a0783369c13c9130137b9f139fd9c2d15c5..57ebbd57e12c4432b6046c7ed82177e52a3a5762 100644 (file)
@@ -2005,25 +2005,27 @@ func cloneTLSConfig(cfg *tls.Config) *tls.Config {
                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,
+               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,
        }
 }
 
@@ -2036,24 +2038,25 @@ func cloneTLSClientConfig(cfg *tls.Config) *tls.Config {
                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,
-               ClientSessionCache:       cfg.ClientSessionCache,
-               MinVersion:               cfg.MinVersion,
-               MaxVersion:               cfg.MaxVersion,
-               CurvePreferences:         cfg.CurvePreferences,
-               Renegotiation:            cfg.Renegotiation,
+               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,
+               ClientSessionCache:          cfg.ClientSessionCache,
+               MinVersion:                  cfg.MinVersion,
+               MaxVersion:                  cfg.MaxVersion,
+               CurvePreferences:            cfg.CurvePreferences,
+               DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
+               Renegotiation:               cfg.Renegotiation,
        }
 }