Revert "Remove use of deprecated net.Error.Temporary (#1589)" (#1594)

miekg · web-flow · commit 39938e9c416f · 2024-08-13T20:39:49.000+02:00
This reverts commit ef7392e. See: #1589 (comment) breaks udp serving
diff --git a/server.go b/server.go
@@ -476,6 +476,9 @@ func (srv *Server) serveTCP(l net.Listener) error {
 			if !srv.isStarted() {
 				return nil
 			}
+			if neterr, ok := err.(net.Error); ok && neterr.Temporary() {
+				continue
+			}
 			return err
 		}
 		srv.lock.Lock()
@@ -532,6 +535,9 @@ func (srv *Server) serveUDP(l net.PacketConn) error {
 			if !srv.isStarted() {
 				return nil
 			}
+			if netErr, ok := err.(net.Error); ok && netErr.Temporary() {
+				continue
+			}
 			return err
 		}
 		if len(m) < headerSize {

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,9 @@ func (srv *Server) serveTCP(l net.Listener) error {`
`476`	`476`	`if !srv.isStarted() {`
`477`	`477`	`return nil`
`478`	`478`	`}`
	`479`	`+ if neterr, ok := err.(net.Error); ok && neterr.Temporary() {`
	`480`	`+ continue`
	`481`	`+ }`
`479`	`482`	`return err`
`480`	`483`	`}`
`481`	`484`	`srv.lock.Lock()`
`@@ -532,6 +535,9 @@ func (srv *Server) serveUDP(l net.PacketConn) error {`
`532`	`535`	`if !srv.isStarted() {`
`533`	`536`	`return nil`
`534`	`537`	`}`
	`538`	`+ if netErr, ok := err.(net.Error); ok && netErr.Temporary() {`
	`539`	`+ continue`
	`540`	`+ }`
`535`	`541`	`return err`
`536`	`542`	`}`
`537`	`543`	`if len(m) < headerSize {`