version 12.1.5

Former-commit-id: cda69f08955cb0d594e98bf26197ee573cbba4b2

core/netutil/addr.go

@@ -91,13 +91,8 @@ var IsLoopbackHost = func(requestHost string) bool {
 const (
 	// defaultServerHostname returns the default hostname which is "localhost"
 	defaultServerHostname = "localhost"
-	// defaultServerPort returns the default port which is 8080, not used
-	defaultServerPort = 8080
 )
 
-// defaultServerAddr the default server addr which is: localhost:8080
-var defaultServerAddr = defaultServerHostname + ":" + strconv.Itoa(defaultServerPort)
-
 // ResolveAddr tries to convert a given string to an address which is compatible with net.Listener and server
 func ResolveAddr(addr string) string {
 	// check if addr has :port, if not do it +:80 ,we need the hostname for many cases

core/netutil/tcp.go

@@ -23,13 +23,17 @@ type tcpKeepAliveListener struct {
 }
 
 // Accept accepts tcp connections aka clients.
-func (l tcpKeepAliveListener) Accept() (c net.Conn, err error) {
+func (l tcpKeepAliveListener) Accept() (net.Conn, error) {
 	tc, err := l.AcceptTCP()
 	if err != nil {
-		return
+		return tc, err
+	}
+	if err = tc.SetKeepAlive(true); err != nil {
+		return tc, err
+	}
+	if err = tc.SetKeepAlivePeriod(3 * time.Minute); err != nil {
+		return tc, err
 	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
 	return tc, nil
 }