Commitcce7843

authored

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

1 parent1f35561 commitcce7843Copy full SHA for cce7843

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

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

Comments

(0)