Skip to content

bpo-43253: don't shutdown invalid socket handles#31892

Merged
asvetlov merged 2 commits into
python:mainfrom
mhils:issue-43253
Mar 15, 2022
Merged

bpo-43253: don't shutdown invalid socket handles#31892
asvetlov merged 2 commits into
python:mainfrom
mhils:issue-43253

Conversation

@mhils

@mhils mhils commented Mar 15, 2022 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

On Windows on the ProactorEventLoop, there are situations where fileno() returns -1 during socket close, in which case calling shutdown() would raise an OSError. Avoid that by explicitly checking fileno().

https://bugs.python.org/issue43253

@mhils mhils requested review from 1st1 and asvetlov as code owners March 15, 2022 07:51
@hugovk

hugovk commented Mar 15, 2022

Copy link
Copy Markdown
Member

If you merge/rebase main the Docs failure should be fixed (in #31893).

mhils and others added 2 commits March 15, 2022 11:12
@mhils
bpo-43253: don't shutdown invalid socket handles
25f862e 
On Windows on the ProactorEventLoop, there are situations where `fileno()` returns -1
during socket close, in which case calling `shutdown()` would raise an OSError.
Avoid that by explicitly checking `fileno()`.
@blurb-it @mhils
📜🤖 Added by blurb_it.
1d4b240
@mhils

mhils commented Mar 15, 2022

Copy link
Copy Markdown
Contributor Author

Thanks for the heads-up, @hugovk! 🍰

@asvetlov asvetlov merged commit 7015541 into python:main Mar 15, 2022
@miss-islington

miss-islington commented Mar 15, 2022

Copy link
Copy Markdown
Contributor

Thanks @mhils for the PR, and @asvetlov for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Mar 15, 2022

Copy link
Copy Markdown
Contributor

Thanks @mhils for the PR, and @asvetlov for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 15, 2022
@mhils @miss-islington
bpo-43253: Don't call shutdown() for invalid socket handles (pythonGH…
ec2ef0b 
…-31892)

(cherry picked from commit 7015541)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
@bedevere-bot

bedevere-bot commented Mar 15, 2022

Copy link
Copy Markdown

GH-31905 is a backport of this pull request to the 3.9 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 15, 2022
@mhils @miss-islington
bpo-43253: Don't call shutdown() for invalid socket handles (pythonGH…
c1d857f 
…-31892)

(cherry picked from commit 7015541)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
@bedevere-bot

bedevere-bot commented Mar 15, 2022

Copy link
Copy Markdown

GH-31906 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 15, 2022
miss-islington added a commit that referenced this pull request Mar 15, 2022
@miss-islington @mhils
bpo-43253: Don't call shutdown() for invalid socket handles (GH-31892)
88c243f 
(cherry picked from commit 7015541)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
miss-islington added a commit that referenced this pull request Mar 15, 2022
@miss-islington @mhils
bpo-43253: Don't call shutdown() for invalid socket handles (GH-31892)
64a68c3 
(cherry picked from commit 7015541)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@miss-islington @mhils @hello-adam
bpo-43253: Don't call shutdown() for invalid socket handles (pythonGH…
4984ff8 
…-31892)

(cherry picked from commit 7015541)

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asvetlov asvetlov asvetlov approved these changes

@1st1 1st1 Awaiting requested review from 1st1 1st1 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@mhils @hugovk @miss-islington @bedevere-bot @asvetlov @the-knights-who-say-ni