Test: fix http2 dial timeout (#570)

* fix http2 dial timeout
v2fly · Jan 11, 2021 · 405a051 · 405a051
1 parent 78e01a3
commit 405a051
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/testing/scenarios/tls_test.go b/testing/scenarios/tls_test.go
@@ -583,7 +583,7 @@ func TestHTTP2(t *testing.T) {
 
 	var errg errgroup.Group
 	for i := 0; i < 10; i++ {
-		errg.Go(testTCPConn(clientPort, 10240*1024, time.Second*40))
+		errg.Go(testTCPConn(clientPort, 7168*1024, time.Second*40))
 	}
 	if err := errg.Wait(); err != nil {
 		t.Error(err)

diff --git a/transport/internet/http/dialer.go b/transport/internet/http/dialer.go
@@ -23,7 +23,7 @@ var (
 	globalDialerAccess sync.Mutex
 )
 
-func getHTTPClient(_ context.Context, dest net.Destination, tlsSettings *tls.Config) *http.Client {
+func getHTTPClient(ctx context.Context, dest net.Destination, tlsSettings *tls.Config) *http.Client {
 	globalDialerAccess.Lock()
 	defer globalDialerAccess.Unlock()
 
@@ -50,7 +50,7 @@ func getHTTPClient(_ context.Context, dest net.Destination, tlsSettings *tls.Con
 			}
 			address := net.ParseAddress(rawHost)
 
-			pconn, err := internet.DialSystem(context.Background(), net.TCPDestination(address, port), nil)
+			pconn, err := internet.DialSystem(ctx, net.TCPDestination(address, port), nil)
 			if err != nil {
 				return nil, err
 			}
@@ -68,9 +68,6 @@ func getHTTPClient(_ context.Context, dest net.Destination, tlsSettings *tls.Con
 			if p := state.NegotiatedProtocol; p != http2.NextProtoTLS {
 				return nil, newError("http2: unexpected ALPN protocol " + p + "; want q" + http2.NextProtoTLS).AtError()
 			}
-			if !state.NegotiatedProtocolIsMutual {
-				return nil, newError("http2: could not negotiate protocol mutually").AtError()
-			}
 			return cn, nil
 		},
 		TLSClientConfig: tlsSettings.GetTLSConfig(tls.WithDestination(dest)),