summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-04-01 11:09:43 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-04-01 11:09:43 +0200
commit11c9327643ba02b6da28dee489172cb79d580868 (patch)
treed405017589c4d6a39bbb020610b03c1ed8729e1e
parentadb2fc6a77852a36e30fa2a672fb5d4c2028d142 (diff)
downloadcpython-11c9327643ba02b6da28dee489172cb79d580868.tar.gz
Issue #23618: Fix EINTR handling on Windows
Windows uses WSAEINTR error code, not EINTR, for socket functions.
-rw-r--r--Modules/socketmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index fd73e08fc9..fcb1ff4f01 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2476,7 +2476,7 @@ internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen,
}
err = GET_ERROR;
- if (err == EINTR && PyErr_CheckSignals())
+ if (CHECK_ERRNO(EINTR) && PyErr_CheckSignals())
return -1;
wait_connect = (s->sock_timeout > 0 && err == IN_PROGRESS_ERR
@@ -2488,7 +2488,7 @@ internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen,
if (timeout == -1) {
/* select() failed */
err = GET_ERROR;
- if (err == EINTR && PyErr_CheckSignals())
+ if (CHECK_ERRNO(EINTR) && PyErr_CheckSignals())
return -1;
return err;
}