WIP: rebase fork onto upstream/main (v1.103.0) #15

Closed
codinget wants to merge 670 commits from webnet into save/webnet-2026-07-29
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 8f89d4fb55 - Show all commits
+2 -2
View File
@@ -22,7 +22,7 @@ import (
"tailscale.com/util/testenv"
)
// serveLocalAPIStateGet serves the localapi endpoint /conn25-state.
// serveLocalAPIStateGet serves the localapi endpoint /conn25/state.
// See also [*Conn25.GetActiveState].
func serveLocalAPIStateGet(h *localapi.Handler, w http.ResponseWriter, r *http.Request) {
// TODO(tailscale/corp#39033): Remove for alpha release.
@@ -31,7 +31,7 @@ func serveLocalAPIStateGet(h *localapi.Handler, w http.ResponseWriter, r *http.R
return
}
if !h.PermitRead {
http.Error(w, "conn25-state access denied", http.StatusForbidden)
http.Error(w, "conn25/state access denied", http.StatusForbidden)
return
}
if r.Method != httpm.GET {
+1 -1
View File
@@ -85,7 +85,7 @@ func init() {
})
ipnlocal.RegisterPeerAPIHandler("/v0/connector/transit-ip", handleConnectorTransitIP)
ipnlocal.HookReplyToDNSQueries.Add(handleHookReplyToDNSQueries)
localapi.Register("conn25-state", serveLocalAPIStateGet)
localapi.Register("conn25/state", serveLocalAPIStateGet)
}
func handleConnectorTransitIP(h ipnlocal.PeerAPIHandler, w http.ResponseWriter, r *http.Request) {