From 8fa88e0444ee703433a103e31335e7d4f5707653 Mon Sep 17 00:00:00 2001 From: Catherine Date: Mon, 1 Jun 2026 08:20:14 +0000 Subject: [PATCH] Fix regression in commit 0cd96a2b0b66de70b2cc0530444c52720e18f080. V12-Ref: F-77365 --- src/caddy.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/caddy.go b/src/caddy.go index 6783316..de96aa9 100644 --- a/src/caddy.go +++ b/src/caddy.go @@ -73,16 +73,14 @@ func tryDialWithSNI(ctx context.Context, domain string) (bool, error) { return false, nil } - connectHost := fallbackURL.Hostname() - if fallbackURL.Port() != "" { - connectHost += ":" + fallbackURL.Port() - } else { - connectHost += ":443" + connectHost, connectPort := fallbackURL.Hostname(), fallbackURL.Port() + if connectPort == "" { + connectPort = "443" } logc.Printf(ctx, "caddy: check TLS %s", fallbackURL) dialer := tls.Dialer{Config: &tls.Config{ServerName: domain}} - connection, err := dialer.DialContext(ctx, "tcp", connectHost) + connection, err := dialer.DialContext(ctx, "tcp", net.JoinHostPort(connectHost, connectPort)) if err != nil { return false, err }