xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: tcp concurrent force close when context done

Browse source
This commit is contained in:
gVisor bot 2022-06-25 09:16:28 +08:00
parent 3116efd498
commit f0b3c6a0c9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adapter/adapter.go
View file

@ -151,6 +151,7 @@ func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
} }
client := http.Client{ client := http.Client{
Timeout: 30 * time.Second,
Transport: transport, Transport: transport,
CheckRedirect: func(req *http.Request, via []*http.Request) error { CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse return http.ErrUseLastResponse
@ -168,13 +169,12 @@ func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
_ = resp.Body.Close() _ = resp.Body.Close()
if unifiedDelay { if unifiedDelay {
start = time.Now() second := time.Now()
respRepeat, err := client.Do(req) resp, err = client.Do(req)
if err != nil { if err == nil {
return 0, err _ = resp.Body.Close()
start = second
} }
_ = respRepeat.Body.Close()
} }
t = uint16(time.Since(start) / time.Millisecond) t = uint16(time.Since(start) / time.Millisecond)