Merge current v2.8 into master

pkg/server/router/tcp/router_test.go

@@ -94,7 +94,6 @@ func (h *httpForwarder) Accept() (net.Conn, error) {
 //
 // - TCP-TLS HostSNI(`foobar`) and HTTPS PathPrefix(`/`)
 //   - On v2.6 and v2.7, the TCP-TLS one takes precedence.
-//
 func Test_Routing(t *testing.T) {
 	// This listener simulates the backend service.
 	// It is capable of switching into server first communication mode,

pkg/server/service/roundtripper_test.go

@@ -55,13 +55,13 @@ QPZ6VGR7+w1jB5BQXqEZcpHQIPSzeQJBAIy9tZJ/AYNlNbcegxEnsSjy/6VdlLsY
 rqPRSAtd/h6oZbs=
 -----END PRIVATE KEY-----`)
 
-// openssl req -newkey rsa:2048 \
-//    -new -nodes -x509 \
-//    -days 3650 \
-//    -out cert.pem \
-//    -keyout key.pem \
-//    -subj "/CN=example.com"
-//    -addext "subjectAltName = DNS:example.com"
+//	openssl req -newkey rsa:2048 \
+//	   -new -nodes -x509 \
+//	   -days 3650 \
+//	   -out cert.pem \
+//	   -keyout key.pem \
+//	   -subj "/CN=example.com"
+//	   -addext "subjectAltName = DNS:example.com"
 var mTLSCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIDJTCCAg2gAwIBAgIUYKnGcLnmMosOSKqTn4ydAMURE4gwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wHhcNMjAwODEzMDkyNzIwWhcNMzAw