diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-02-11 09:27:05 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-02-11 09:27:05 (GMT) |
| commit | f84d1b9375ff1d761f39f2878c68b09e3db17027 (patch) | |
| tree | c63caf9410e4b339c8c468c56681b13187a99c94 /Modules | |
| parent | 03ca23d892bae3f3b524f8230e417903c3f5b134 (diff) | |
| download | cpython-f84d1b9375ff1d761f39f2878c68b09e3db17027.zip cpython-f84d1b9375ff1d761f39f2878c68b09e3db17027.tar.gz cpython-f84d1b9375ff1d761f39f2878c68b09e3db17027.tar.bz2 | |
Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE.
Proposed by Tim Peters.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 6448cb0..0e79b54 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -377,8 +377,10 @@ check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing) return SOCKET_HAS_BEEN_CLOSED; /* Guard against socket too large for select*/ +#ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE if (s->sock_fd >= FD_SETSIZE) return SOCKET_INVALID; +#endif /* Construct the arguments to select */ tv.tv_sec = (int)s->sock_timeout; diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 1ec3166..a445581 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -396,7 +396,14 @@ static int taskwindow; static PyTypeObject sock_type; /* Can we call select() with this socket without a buffer overrun? */ +#ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE +/* Platform can select file descriptors beyond FD_SETSIZE */ +#define IS_SELECTABLE(s) 1 +#else +/* POSIX says selecting file descriptors beyond FD_SETSIZE + has undefined behaviour. */ #define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE) +#endif static PyObject* select_error(void) |