webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: rebase for 2026-05-18 #7

Closed
codinget wants to merge 234 commits from rebase/2026-05-18 into webnet
pull from: rebase/2026-05-18
merge into: webnet:webnet
Conversation 1 Commits 234 Files Changed 425
+3 -1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit daddb14b8f - Show all commits
control/controlhttp/client_js.go
+3 -1
View File
@@ -32,7 +32,9 @@ func (d *Dialer) Dial(ctx context.Context) (*ClientConn, error) {
host := d.Hostname host := d.Hostname
// If using a custom control server (on a non-standard port), prefer that. // If using a custom control server (on a non-standard port), prefer that.
// This mirrors the port selection in newNoiseClient from noise.go. // This mirrors the port selection in newNoiseClient from noise.go.
if d.HTTPPort != "" && d.HTTPPort != "80" && d.HTTPSPort == "443" { // Also use ws:// when HTTPS is explicitly disabled (NoPort), which happens
// for http:// URLs with private hostnames (e.g. http://localhost:31544).
if d.HTTPPort != "" && d.HTTPPort != "80" && (d.HTTPSPort == "443" || d.HTTPSPort == NoPort) {
wsScheme = "ws" wsScheme = "ws"
host = net.JoinHostPort(host, d.HTTPPort) host = net.JoinHostPort(host, d.HTTPPort)
} }