From bc28fceaf38c6ca5ce7d749c22bbd2ac0405170c Mon Sep 17 00:00:00 2001
From: Evgeniy Kulikov <im-kulikov@users.noreply.github.com>
Date: Fri, 1 Feb 2019 17:33:56 +0300
Subject: [PATCH] Fix unhandled errors (#1271)

---
 echo.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/echo.go b/echo.go
index 0fe6880f..6a41e561 100644
--- a/echo.go
+++ b/echo.go
@@ -764,13 +764,14 @@ type tcpKeepAliveListener struct {
 }
 
 func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
+	if c, err = ln.AcceptTCP(); err != nil {
+		return
+	} else if err = c.(*net.TCPConn).SetKeepAlive(true); err != nil {
+		return
+	} else if err = c.(*net.TCPConn).SetKeepAlivePeriod(3 * time.Minute); err != nil {
 		return
 	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
+	return
 }
 
 func newListener(address string) (*tcpKeepAliveListener, error) {