use a net.ErrClosed when returning Accept from a closed server (quic-…

…go#4569)
apernet · Jun 24, 2024 · 8f11104 · 8f11104
1 parent 2da1681
commit 8f11104
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -18,7 +18,12 @@ import (
 )
 
 // ErrServerClosed is returned by the Listener or EarlyListener's Accept method after a call to Close.
-var ErrServerClosed = errors.New("quic: server closed")
+var ErrServerClosed = errServerClosed{}
+
+type errServerClosed struct{}
+
+func (errServerClosed) Error() string { return "quic: server closed" }
+func (errServerClosed) Unwrap() error { return net.ErrClosed }
 
 // packetHandler handles packets
 type packetHandler interface {

diff --git a/server_test.go b/server_test.go
@@ -941,6 +941,7 @@ var _ = Describe("Server", func() {
 					defer GinkgoRecover()
 					_, err := serv.Accept(context.Background())
 					Expect(err).To(MatchError(ErrServerClosed))
+					Expect(err).To(MatchError(net.ErrClosed))
 					close(done)
 				}()