From 34e4625b640e339fb0d8255ee81a5580144a95fb Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Fri, 28 Oct 2022 17:22:38 +0200 Subject: [PATCH] Other: Don't try proxy if dial was cancelled --- internal/dialer/dialer_proxy.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/dialer/dialer_proxy.go b/internal/dialer/dialer_proxy.go index fddb6091..c9ac99fa 100644 --- a/internal/dialer/dialer_proxy.go +++ b/internal/dialer/dialer_proxy.go @@ -86,8 +86,12 @@ func (d *ProxyTLSDialer) DialTLSContext(ctx context.Context, network, address st conn, err := d.dialer.DialTLSContext(ctx, network, address) if err == nil || !d.allowProxy { return conn, err + } else if errors.Is(err, context.Canceled) { + return nil, err } + logrus.WithError(err).Debug("DialTLS failed, trying proxy") + if err := d.switchToReachableServer(); err != nil { return nil, err }