summaryrefslogtreecommitdiffhomepage
path: root/ipn/localapi/localapi.go
diff options
context:
space:
mode:
authorMarwan Sulaiman <marwan@tailscale.com>2023-08-24 00:00:56 +0100
committerMarwan Sulaiman <marwan@tailscale.com>2023-08-24 15:38:54 +0100
commitdf49cb24d549393e75e95065c0fc865e2108eb7f (patch)
treed4ab6b4c2fe9dd07d47fbbac9be3fb8a51bdcae6 /ipn/localapi/localapi.go
parent9c07f4f512f71799a796cb3cdb5532657df8444f (diff)
downloadtailscale-marwan/scmem.tar.xz
tailscale-marwan/scmem.zip
ipn, ipn/ipnlocal: add an in memory serve configmarwan/scmem
This PR adds a parallel in-memory ServeConfig so that foreground funnels are guaranteed to go away in case of unexpected shutdown Updates #8489 Signed-off-by: Marwan Sulaiman <marwan@tailscale.com>
Diffstat (limited to 'ipn/localapi/localapi.go')
-rw-r--r--ipn/localapi/localapi.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipn/localapi/localapi.go b/ipn/localapi/localapi.go
index 44ec4dc43..2dcb9df88 100644
--- a/ipn/localapi/localapi.go
+++ b/ipn/localapi/localapi.go
@@ -835,7 +835,7 @@ func (h *Handler) serveServeConfig(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
- config := h.b.ServeConfig()
+ config := h.b.ServeConfig(r.FormValue("memory") == "true")
json.NewEncoder(w).Encode(config)
case "POST":
if !h.PermitWrite {