Fix connection kill, when IdleTimeout given without setting MaxTimeout.

czoczo · belak · commit 9253a53eda6d · 2019-03-31T09:59:03.000-07:00
diff --git a/conn.go b/conn.go
@@ -44,7 +44,7 @@ func (c *serverConn) updateDeadline() {
 	switch {
 	case c.idleTimeout > 0:
 		idleDeadline := time.Now().Add(c.idleTimeout)
-		if idleDeadline.Unix() < c.maxDeadline.Unix() {
+		if idleDeadline.Unix() < c.maxDeadline.Unix() || c.maxDeadline.IsZero() {
 			c.Conn.SetDeadline(idleDeadline)
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (c *serverConn) updateDeadline() {`
`44`	`44`	`switch {`
`45`	`45`	`case c.idleTimeout > 0:`
`46`	`46`	`idleDeadline := time.Now().Add(c.idleTimeout)`
`47`		`- if idleDeadline.Unix() < c.maxDeadline.Unix() {`
	`47`	`+ if idleDeadline.Unix() < c.maxDeadline.Unix() \|\| c.maxDeadline.IsZero() {`
`48`	`48`	`c.Conn.SetDeadline(idleDeadline)`
`49`	`49`	`return`
`50`	`50`	`}`