ipn/ipnserver: remove IdleTimeout

We no longer need this on Windows, and it was never required on other platforms.
It just results in more short-lived connections unless we use HTTP/2.

Updates tailscale/corp#18342

Signed-off-by: Nick Khyl <nickk@tailscale.com>
pull/13393/head
Nick Khyl 3 months ago committed by Nick Khyl
parent e7a6e7930f
commit e7b5e8c8cd

@ -18,7 +18,6 @@ import (
"strings" "strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time"
"unicode" "unicode"
"tailscale.com/envknob" "tailscale.com/envknob"
@ -505,15 +504,7 @@ func (s *Server) Run(ctx context.Context, ln net.Listener) error {
ConnContext: func(ctx context.Context, c net.Conn) context.Context { ConnContext: func(ctx context.Context, c net.Conn) context.Context {
return contextWithActor(ctx, s.logf, c) return contextWithActor(ctx, s.logf, c)
}, },
// Localhost connections are cheap; so only do ErrorLog: logger.StdLogger(logger.WithPrefix(s.logf, "ipnserver: ")),
// keep-alives for a short period of time, as these
// active connections lock the server into only serving
// that user. If the user has this page open, we don't
// want another switching user to be locked out for
// minutes. 5 seconds is enough to let browser hit
// favicon.ico and such.
IdleTimeout: 5 * time.Second,
ErrorLog: logger.StdLogger(logger.WithPrefix(s.logf, "ipnserver: ")),
} }
if err := hs.Serve(ln); err != nil { if err := hs.Serve(ln); err != nil {
if err := ctx.Err(); err != nil { if err := ctx.Err(); err != nil {

Loading…
Cancel
Save