diff options
Diffstat (limited to 'internal/net')
| -rw-r--r-- | internal/net/conn.go | 6 | ||||
| -rw-r--r-- | internal/net/server.go | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/internal/net/conn.go b/internal/net/conn.go index a4be83a..d8c867e 100644 --- a/internal/net/conn.go +++ b/internal/net/conn.go @@ -79,7 +79,11 @@ func (t *tcpConn) ReadMessage() (string, error) { text = stripIAC(text) text = truncateLine(text, maxLineLength) if t.echoOff.Load() { - t.conn.Write([]byte("\r\n")) + // Refresh the write deadline: the writer goroutine may have left a + // stale deadline in the past, which would silently drop this echo on + // an idle connection. + _ = t.conn.SetWriteDeadline(time.Now().Add(writeDeadline)) + _, _ = t.conn.Write([]byte("\r\n")) } return text, nil } diff --git a/internal/net/server.go b/internal/net/server.go index 71e34c8..8e23a1f 100644 --- a/internal/net/server.go +++ b/internal/net/server.go @@ -808,6 +808,11 @@ func (s *Server) Shutdown() { if remaining <= 0 { break } + // Cap each wait so one stalled writer cannot consume the whole + // budget and starve every later session's flush. + if remaining > 200*time.Millisecond { + remaining = 200 * time.Millisecond + } select { case <-sess.writeDone: case <-time.After(remaining): |