Merge pull request #378 from lesismal/dev

websocket: set KeepaliveTime to 120s by default

nbhttp/websocket/upgrader.go

@@ -131,8 +131,9 @@ func NewUpgrader() *Upgrader {
 	u := &Upgrader{
 		commonFields: commonFields{
 			Engine:                     DefaultEngine,
-			compressionLevel:           defaultCompressionLevel,
+			KeepaliveTime:              nbhttp.DefaultKeepaliveTime,
 			BlockingModAsyncCloseDelay: DefaultBlockingModAsyncCloseDelay,
+			compressionLevel:           defaultCompressionLevel,
 		},
 		BlockingModReadBufferSize:      DefaultBlockingReadBufferSize,
 		BlockingModAsyncWrite:          DefaultBlockingModAsyncWrite,
@@ -430,6 +431,12 @@ func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeade
 		return nil, err
 	}
 
+	if u.KeepaliveTime > 0 {
+		conn.SetReadDeadline(time.Now().Add(u.KeepaliveTime))
+	} else {
+		conn.SetReadDeadline(time.Time{})
+	}
+
 	if wsc.openHandler != nil {
 		wsc.openHandler(wsc)
 	}
@@ -560,12 +567,6 @@ func (u *Upgrader) commResponse(conn net.Conn, responseHeader http.Header, chall
 		return err
 	}
 
-	if u.KeepaliveTime <= 0 {
-		conn.SetReadDeadline(time.Now().Add(nbhttp.DefaultKeepaliveTime))
-	} else {
-		conn.SetReadDeadline(time.Now().Add(u.KeepaliveTime))
-	}
-
 	return nil
 }