Merge branch v2.11 into v3.0

integration/fixtures/tcp/service_errors.toml

@@ -24,10 +24,12 @@
   [tcp.routers.router1]
     service = "service1"
     rule = "HostSNI(`snitest.net`)"
+    [tcp.routers.router1.tls]
 
   [tcp.routers.router2]
     service = "service2"
     rule = "HostSNI(`snitest.com`)"
+    [tcp.routers.router2.tls]
 
 [tcp.services]
   [tcp.services.service1]

integration/https_test.go

@@ -1134,8 +1134,6 @@ func (s *HTTPSSuite) TestWithDomainFronting() {
 	}
 
 	for _, test := range testCases {
-		test := test
-
 		req, err := http.NewRequest(http.MethodGet, "https://127.0.0.1:4443", nil)
 		require.NoError(s.T(), err)
 		req.Host = test.hostHeader
@@ -1179,8 +1177,6 @@ func (s *HTTPSSuite) TestWithInvalidTLSOption() {
 	}
 
 	for _, test := range testCases {
-		test := test
-
 		tlsConfig := &tls.Config{
 			InsecureSkipVerify: true,
 		}