mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

internal_connect(): Windows. When sock_timeout > 0 and connect() yields

Browse source 
WSAEWOULDBLOCK, the second connect() attempt appears to yield WSAEISCONN
on Win98 but WSAEINVAL on Win2K.  So accept either as meaning "yawn,
fine".  This allows test_socket to succeed on my Win2K box (which it
already did on my Win98SE box).
This commit is contained in:
Tim Peters 2002-08-06 22:25:02 +00:00
parent d37f75b88a
commit 5814187f5b
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Modules/socketmodule.c
View file

@ -1305,8 +1305,16 @@ internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen)
if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK) {
internal_select(s, 1);
res = connect(s->sock_fd, addr, addrlen);
if (res < 0 && WSAGetLastError() == WSAEISCONN)
res = 0;
if (res < 0) {
/* On Win98, WSAEISCONN was seen here. But
* on Win2K, WSAEINVAL. So accept both as
* meaning "fine".
*/
int code = WSAGetLastError();
if (code == WSAEISCONN ||
code == WSAEINVAL)
res = 0;
}
}
}
@ -2495,11 +2503,11 @@ socket_ntohl(PyObject *self, PyObject *arg)
return PyErr_Format(PyExc_OverflowError,
"long int larger than 32 bits");
x = y;
}
}
#endif
}
else
return PyErr_Format(PyExc_TypeError,
return PyErr_Format(PyExc_TypeError,
"expected int/long, %s found",
arg->ob_type->tp_name);
if (x == (unsigned long) -1 && PyErr_Occurred())
@ -2554,11 +2562,11 @@ socket_htonl(PyObject *self, PyObject *arg)
return PyErr_Format(PyExc_OverflowError,
"long int larger than 32 bits");
x = y;
}
}
#endif
}
else
return PyErr_Format(PyExc_TypeError,
return PyErr_Format(PyExc_TypeError,
"expected int/long, %s found",
arg->ob_type->tp_name);
return PyInt_FromLong(htonl(x));