Commita0606d5

authored and

committed

fix: wsnet.(*Dialer).DialContext hangs forever if ctx is cancelled (#425)

(cherry picked from commitcce7843)(cherry picked from commitac1fdd7)

1 parent175c42e commita0606d5Copy full SHA for a0606d5

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -386,19 +386,22 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.`
`386`	`386`	`ctx,cancel:=context.WithTimeout(ctx,time.Second*5)`
`387`	`387`	`defercancel()`
`388`	`388`
`389`		`-errCh:=make(chanerror)`
	`389`	`+errCh:=make(chanerror,1)`
`390`	`390`	`gofunc() {`
	`391`	`+deferclose(errCh)`
	`392`	`+`
`391`	`393`	`varresDialChannelResponse`
`392`	`394`	`err=json.NewDecoder(rw).Decode(&res)`
`393`	`395`	`iferr!=nil {`
`394`	`396`	`errCh<-fmt.Errorf("read dial response: %w",err)`
`395`	`397`	`return`
`396`	`398`	`}`
	`399`	`+`
`397`	`400`	`d.log.Debug(ctx,"dial response",slog.F("res",res))`
`398`	`401`	`ifres.Err=="" {`
`399`		`-close(errCh)`
`400`	`402`	`return`
`401`	`403`	`}`
	`404`	`+`
`402`	`405`	`err:=errors.New(res.Err)`
`403`	`406`	`ifres.Code==CodeDialErr {`
`404`	`407`	`err=&net.OpError{`

Comments

(0)