Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-102336: remove windows 7 special handling #102337

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
zooba merged 4 commits into from
Mar 1, 2023
Merged

gh-102336: remove windows 7 special handling #102337

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b93dc7a
remove windows 7 special handling
maxbachmann Feb 28, 2023
6b4d666
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 28, 2023
dc8a648
revert broken part
maxbachmann Feb 28, 2023
3a2f4c1
add missing SetHandleInformation
maxbachmann Feb 28, 2023
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
Prev Previous commit
Next Next commit
revert broken part
  • Loading branch information
@maxbachmann
maxbachmann authored Feb 28, 2023
commit dc8a648d4be822305158176426dbfa8032a2652f
12 changes: 8 additions & 4 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5331,8 +5331,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto,

Py_BEGIN_ALLOW_THREADS
fd = WSASocketW(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
FROM_PROTOCOL_INFO, &info, 0,
WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
FROM_PROTOCOL_INFO, &info, 0, WSA_FLAG_OVERLAPPED);
Py_END_ALLOW_THREADS
if (fd == INVALID_SOCKET) {
set_error();
Expand Down Expand Up @@ -6153,10 +6152,15 @@ socket_dup(PyObject *self, PyObject *fdobj)

newfd = WSASocketW(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
FROM_PROTOCOL_INFO,
&info, 0,
WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
&info, 0, WSA_FLAG_OVERLAPPED);
if (newfd == INVALID_SOCKET)
return set_error();

if (!SetHandleInformation((HANDLE)newfd, HANDLE_FLAG_INHERIT, 0)) {
closesocket(newfd);
PyErr_SetFromWindowsErr(0);
return NULL;
}
#else
/* On UNIX, dup can be used to duplicate the file descriptor of a socket */
newfd = _Py_dup(fd);
Expand Down