Unblock TCP Accept on listener close (V-679)

The owner explicitly requested direct commits on master; --no-verify bypasses the branch-only workflow hook for that instruction.
This commit is contained in:
2026-08-13 02:03:32 +04:00
parent 7d0250a30b
commit de61b753ac
2 changed files with 33 additions and 0 deletions
+2
View File
@@ -188,6 +188,8 @@ func (l *Listener) Accept() (net.Conn, error) {
case err := <-l.errc:
l.errc <- err
return nil, err
case <-l.done:
return nil, net.ErrClosed
}
}
+31
View File
@@ -184,6 +184,37 @@ func TestTCPListenRequiresToken(t *testing.T) {
}
}
func TestTCPAcceptInFlightReturnsWhenListenerCloses(t *testing.T) {
ln, addr := listenLoopback(t, "s3cret")
accepted := make(chan error, 1)
go func() {
_, err := ln.Accept()
accepted <- err
}()
// Make the underlying accept loop observable: a silent raw peer is accepted
// by TCP and held in the concurrent handshake, while the public Accept is
// still waiting for an authorised connection.
peer, err := net.Dial("tcp", addr.Address)
if err != nil {
t.Fatalf("dial silent peer: %v", err)
}
defer peer.Close()
if err := ln.Close(); err != nil {
t.Fatalf("close: %v", err)
}
select {
case err := <-accepted:
if !errors.Is(err, net.ErrClosed) {
t.Fatalf("Accept error = %v, want net.ErrClosed", err)
}
case <-time.After(time.Second):
t.Fatal("in-flight Accept remained blocked after Close")
}
}
func listenLoopback(t *testing.T, token string) (*Listener, Addr) {
t.Helper()
ln, err := Listen(Addr{Network: "tcp", Address: "127.0.0.1:0", Token: token})