diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-07-22 17:47:09 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-07-22 17:47:09 +0200 |
| commit | ba7c21ae5a444cebdf8478b632a4ab796d484785 (patch) | |
| tree | 1f6b1a48d5323b2bc424a2d01fe3848aec9c833f /Modules/_ssl.c | |
| parent | d56b82b46e09c18e494c9670d0934a0f0b7dd36c (diff) | |
| parent | e167e19af8944f417def95d53d0493b83f133ad1 (diff) | |
| download | cpython-ba7c21ae5a444cebdf8478b632a4ab796d484785.tar.gz | |
Merge 3.5 (INVALID_SOCKET)
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 0e979e0305..8a4654a7be 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -113,6 +113,10 @@ struct py_ssl_library_code { # define HAVE_ALPN #endif +#ifndef INVALID_SOCKET /* MS defines this */ +#define INVALID_SOCKET (-1) +#endif + enum py_ssl_error { /* these mirror ssl.h */ PY_SSL_ERROR_NONE, @@ -1699,7 +1703,7 @@ PySSL_select(PySocketSockObject *s, int writing, _PyTime_t timeout) } /* Guard against closed socket */ - if (s->sock_fd < 0) + if (s->sock_fd == INVALID_SOCKET) return SOCKET_HAS_BEEN_CLOSED; /* Prefer poll, if available, since you can poll() any fd @@ -2023,7 +2027,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self) if (sock != NULL) { /* Guard against closed socket */ - if ((((PyObject*)sock) == Py_None) || (sock->sock_fd < 0)) { + if ((((PyObject*)sock) == Py_None) || (sock->sock_fd == INVALID_SOCKET)) { _setSSLError("Underlying socket connection gone", PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__); return NULL; |