Skip to content

http2: return http.ErrServerClosed in Server.Serve #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pires merged 1 commit into from
Feb 5, 2026
Merged

http2: return http.ErrServerClosed in Server.Serve #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions helper/http2/http2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ func (srv *Server) Serve(ln net.Listener) error {
srv.errorLog().Printf("listener %q: accept error (retrying in %v): %v", ln.Addr(), delay, err)
time.Sleep(delay)
} else if err != nil {
if srv.isClosed() {
return http.ErrServerClosed
}
return fmt.Errorf("failed to accept connection: %w", err)
}

Expand Down Expand Up @@ -198,6 +201,12 @@ func (srv *Server) closeListeners() error {
return err
}

func (srv *Server) isClosed() bool {
srv.mu.Lock()
defer srv.mu.Unlock()
return srv.closed
}

// h1Listener is used to signal back http.Server's Close and Shutdown to the
// HTTP/2 server.
type h1Listener struct {
Expand Down
4 changes: 2 additions & 2 deletions helper/http2/http2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func newTestServer(t *testing.T) (addr string, server *http.Server) {

t.Cleanup(func() {
err := <-done
if err != nil && !errors.Is(err, net.ErrClosed) {
if err != nil && !errors.Is(err, http.ErrServerClosed) {
t.Fatalf("failed to serve: %v", err)
}
})
Expand Down Expand Up @@ -231,7 +231,7 @@ func newTLSTestServer(t *testing.T) (addr string, server *http.Server) {

t.Cleanup(func() {
err := <-done
if err != nil && !errors.Is(err, net.ErrClosed) {
if err != nil && !errors.Is(err, http.ErrServerClosed) {
t.Fatalf("failed to serve: %v", err)
}
})
Expand Down
Loading