lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-05-16 20:18:36 -04:00
Code Issues Releases Wiki Activity

Test: fix http2 dial timeout (#570)

Browse Source 
* fix http2 dial timeout
This commit is contained in:
Kslr 2021-01-11 17:03:03 +08:00 committed by GitHub
parent 78e01a37c7
commit 405a051c50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/scenarios/tls_test.go
View File

@ -583,7 +583,7 @@ func TestHTTP2(t *testing.T) {
var errg errgroup.Group var errg errgroup.Group
for i := 0; i < 10; i++ { 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 { if err := errg.Wait(); err != nil {
t.Error(err) t.Error(err)

7
transport/internet/http/dialer.go
View File

@ -23,7 +23,7 @@ var (
globalDialerAccess sync.Mutex 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() globalDialerAccess.Lock()
defer globalDialerAccess.Unlock() defer globalDialerAccess.Unlock()
@ -50,7 +50,7 @@ func getHTTPClient(_ context.Context, dest net.Destination, tlsSettings *tls.Con
} }
address := net.ParseAddress(rawHost) 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 { if err != nil {
return nil, err return nil, err
} }
@ -68,9 +68,6 @@ func getHTTPClient(_ context.Context, dest net.Destination, tlsSettings *tls.Con
if p := state.NegotiatedProtocol; p != http2.NextProtoTLS { if p := state.NegotiatedProtocol; p != http2.NextProtoTLS {
return nil, newError("http2: unexpected ALPN protocol " + p + "; want q" + http2.NextProtoTLS).AtError() 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 return cn, nil
}, },
TLSClientConfig: tlsSettings.GetTLSConfig(tls.WithDestination(dest)), TLSClientConfig: tlsSettings.GetTLSConfig(tls.WithDestination(dest)),