mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

The connect timeout code wasn't working on Windows.

Browse source 
Rather than trying to second-guess the various error returns
of a second connect(), use select() to determine whether the
socket becomes writable (which means connected).
This commit is contained in:
Guido van Rossum 2003-02-19 17:50:16 +00:00
parent 2ffec02b48
commit b76bdf8ef7
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/socketmodule.c
View file

@ -1336,18 +1336,19 @@ internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen)
if (s->sock_timeout > 0.0) { if (s->sock_timeout > 0.0) {
if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK) {
internal_select(s, 1); /* This is a mess. Best solution: trust select */
res = connect(s->sock_fd, addr, addrlen); fd_set fds;
if (res < 0) { struct timeval tv;
/* On Win98, WSAEISCONN was seen here. But tv.tv_sec = (int)s->sock_timeout;
* on Win2K, WSAEINVAL. So accept both as tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
* meaning "fine". FD_ZERO(&fds);
*/ FD_SET(s->sock_fd, &fds);
int code = WSAGetLastError(); res = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
if (code == WSAEISCONN || if (res == 0)
code == WSAEINVAL) res = WSAEWOULDBLOCK;
else if (res > 0)
res = 0; res = 0;
} /* else if (res < 0) an error occurred */
} }
} }