Skip to content

gh-93821: Fix bug that accepting a socket connection and ERROR_NETNAME_DELETED occurs causes serving socket to be closed #124032

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

gh-93821: Fix bug that accepting a socket connection and ERROR_NETNAME_DELETED occurs causes serving socket to be closed #124032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d44ad
Fix bug that when accepting a socket connection and ERROR_NETNAME_DEL…
StanHatko Sep 13, 2024
b61114c
On UNIX-like systems don't fail because winerror is not available
StanHatko Sep 13, 2024
a5fcc88
Omit unnecessary winerror check and improve comment
StanHatko Sep 13, 2024
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
2 changes: 2 additions & 0 deletions Lib/asyncio/proactor_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,8 @@ def loop(f=None):
if self.is_closed():
return
f = self._proactor.accept(sock)
except ConnectionResetError:
self.call_soon(loop)
except OSError as exc:
if sock.fileno() != -1:
self.call_exception_handler({
Expand Down
11 changes: 10 additions & 1 deletion Lib/asyncio/windows_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,16 @@ def accept(self, listener):
ov.AcceptEx(listener.fileno(), conn.fileno())

def finish_accept(trans, key, ov):
ov.getresult()
try:
ov.getresult()
except OSError as exc:
# If ERROR_NETNAME_DELETED or ERROR_OPERATION_ABORTED occur,
# do not close the serving socket.
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
conn.close()
raise ConnectionResetError(*exc.args)
raise
# Use SO_UPDATE_ACCEPT_CONTEXT so getsockname() etc work.
buf = struct.pack('@P', listener.fileno())
conn.setsockopt(socket.SOL_SOCKET,
Expand Down
Loading