Merge pull request moby#26406 from AkihiroSuda/fix-make-manpages

cpuguy83 · web-flow · commit 93e8aff1bc4a · 2016-09-08T15:37:54.000-04:00
client: transport: fix tlsconfig Clone() on different Golang versions
diff --git a/client/transport/tlsconfig_clone.go b/client/transport/tlsconfig_clone.go
@@ -1,4 +1,4 @@
-// +build !go1.7,!windows
+// +build go1.8
 
 package transport
 
diff --git a/client/transport/tlsconfig_clone_go16.go b/client/transport/tlsconfig_clone_go16.go
@@ -0,0 +1,31 @@
+// +build go1.6,!go1.7
+
+package transport
+
+import "crypto/tls"
+
+// TLSConfigClone returns a clone of tls.Config. This function is provided for
+// compatibility for go1.6 that doesn't include this method in stdlib.
+func TLSConfigClone(c *tls.Config) *tls.Config {
+	return &tls.Config{
+		Rand:                     c.Rand,
+		Time:                     c.Time,
+		Certificates:             c.Certificates,
+		NameToCertificate:        c.NameToCertificate,
+		GetCertificate:           c.GetCertificate,
+		RootCAs:                  c.RootCAs,
+		NextProtos:               c.NextProtos,
+		ServerName:               c.ServerName,
+		ClientAuth:               c.ClientAuth,
+		ClientCAs:                c.ClientCAs,
+		InsecureSkipVerify:       c.InsecureSkipVerify,
+		CipherSuites:             c.CipherSuites,
+		PreferServerCipherSuites: c.PreferServerCipherSuites,
+		SessionTicketsDisabled:   c.SessionTicketsDisabled,
+		SessionTicketKey:         c.SessionTicketKey,
+		ClientSessionCache:       c.ClientSessionCache,
+		MinVersion:               c.MinVersion,
+		MaxVersion:               c.MaxVersion,
+		CurvePreferences:         c.CurvePreferences,
+	}
+}
diff --git a/client/transport/tlsconfig_clone_go17.go b/client/transport/tlsconfig_clone_go17.go
@@ -1,4 +1,4 @@
-// +build go1.7
+// +build go1.7,!go1.8
 
 package transport
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !go1.7,!windows`
	`1`	`+// +build go1.8`
`2`	`2`
`3`	`3`	`package transport`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build go1.7`
	`1`	`+// +build go1.7,!go1.8`
`2`	`2`
`3`	`3`	`package transport`
`4`	`4`