Skip to content

Sockets: rename the server's private close() to close_and_wait() - #1865

Merged
Mysticial merged 1 commit into
mainfrom
server-close-and-wait-name
Nov 7, 2026
Merged

Mysticial merged 1 commit into
mainfrom
server-close-and-wait-name

Conversation

@pa-devbot

Copy link
Copy Markdown
Collaborator

Follow-up to #1864 (per its review): in the server classes, rename the private close() to close_and_wait() to mirror the client classes, which have close() (public, non-blocking) + close_and_wait() (private, blocking).

Pure rename, no behaviour change:

  • ServerSocket_POSIX, ServerSocket_WinSocket, ServerSocket_Qt: the private destructor-only blocking teardown is now close_and_wait(); the destructors call it.
  • All comments and docs that referred to that teardown as close() are updated (AbstractServerSocket.h, the three backends' headers/sources - e.g. the DESTRUCTING-preservation note in ServerSocket_Qt::on_close_connection() and the "close_and_wait() joins the whole list" notes).
  • close_connection() is untouched.

Verification: full local run, 0 failures; all 27 socket tests pass.

Mirrors the ClientSocket naming, per review of #1864: the private
blocking teardown in ServerSocket_POSIX, ServerSocket_WinSocket and
ServerSocket_Qt is now close_and_wait() (destructor-only), and the
comments and docs that referred to it as close() are updated. No
behaviour change.
@Mysticial
Mysticial merged commit 7c1090e into main Nov 7, 2026
8 checks passed
@Mysticial
Mysticial deleted the server-close-and-wait-name branch November 7, 2026 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants