Merge branch 'refs/heads/master' into dev

This commit is contained in:
wenyifan
2024-07-17 15:17:00 +08:00
90 changed files with 2370 additions and 514 deletions

View File

@ -68,7 +68,7 @@ func (d *mtlsDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialO
opt(&options)
}
conn, err = options.NetDialer.Dial(ctx, "tcp", addr)
conn, err = options.Dialer.Dial(ctx, "tcp", addr)
if err != nil {
return
}