diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-07-22 15:47:09 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-07-22 15:47:09 (GMT) |
| commit | d3afb62b8fb38417c3f0bf6873ed64bd9efd8e43 (patch) | |
| tree | 98d248b4db1e4febc04224095ce4a594fd37ac99 /Modules/_ssl.c | |
| parent | 5e1989ce899d4afa937977b30a7b2fe9c0bf085c (diff) | |
| parent | 524714eeda70de01046e3b4736516f41d7d11010 (diff) | |
| download | cpython-d3afb62b8fb38417c3f0bf6873ed64bd9efd8e43.zip cpython-d3afb62b8fb38417c3f0bf6873ed64bd9efd8e43.tar.gz cpython-d3afb62b8fb38417c3f0bf6873ed64bd9efd8e43.tar.bz2 | |
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 0e979e0..8a4654a 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; |