traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.5 (INVALID_SOCKET)

This commit is contained in:
Victor Stinner 2016-07-22 17:47:09 +02:00
parent 5e1989ce89 524714eeda
commit d3afb62b8f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_ssl.c
View File

@ -113,6 +113,10 @@ struct py_ssl_library_code {
# define HAVE_ALPN # define HAVE_ALPN
#endif #endif
#ifndef INVALID_SOCKET /* MS defines this */
#define INVALID_SOCKET (-1)
#endif
enum py_ssl_error { enum py_ssl_error {
/* these mirror ssl.h */ /* these mirror ssl.h */
PY_SSL_ERROR_NONE, PY_SSL_ERROR_NONE,
@ -1699,7 +1703,7 @@ PySSL_select(PySocketSockObject *s, int writing, _PyTime_t timeout)
} }
/* Guard against closed socket */ /* Guard against closed socket */
if (s->sock_fd < 0) if (s->sock_fd == INVALID_SOCKET)
return SOCKET_HAS_BEEN_CLOSED; return SOCKET_HAS_BEEN_CLOSED;
/* Prefer poll, if available, since you can poll() any fd /* Prefer poll, if available, since you can poll() any fd
@ -2023,7 +2027,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
if (sock != NULL) { if (sock != NULL) {
/* Guard against closed socket */ /* 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", _setSSLError("Underlying socket connection gone",
PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__); PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__);
return NULL; return NULL;

12
Modules/socketmodule.c
View File

@ -2579,8 +2579,8 @@ sock_close(PySocketSockObject *s)
int res; int res;
fd = s->sock_fd; fd = s->sock_fd;
if (fd != -1) { if (fd != INVALID_SOCKET) {
s->sock_fd = -1; s->sock_fd = INVALID_SOCKET;
/* We do not want to retry upon EINTR: see /* We do not want to retry upon EINTR: see
http://lwn.net/Articles/576478/ and http://lwn.net/Articles/576478/ and
@ -2606,7 +2606,7 @@ static PyObject *
sock_detach(PySocketSockObject *s) sock_detach(PySocketSockObject *s)
{ {
SOCKET_T fd = s->sock_fd; SOCKET_T fd = s->sock_fd;
s->sock_fd = -1; s->sock_fd = INVALID_SOCKET;
return PyLong_FromSocket_t(fd); return PyLong_FromSocket_t(fd);
} }
@ -4202,7 +4202,7 @@ sock_finalize(PySocketSockObject *s)
/* Save the current exception, if any. */ /* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback); PyErr_Fetch(&error_type, &error_value, &error_traceback);
if (s->sock_fd != -1) { if (s->sock_fd != INVALID_SOCKET) {
if (PyErr_ResourceWarning((PyObject *)s, 1, "unclosed %R", s)) { if (PyErr_ResourceWarning((PyObject *)s, 1, "unclosed %R", s)) {
/* Spurious errors can appear at shutdown */ /* Spurious errors can appear at shutdown */
if (PyErr_ExceptionMatches(PyExc_Warning)) { if (PyErr_ExceptionMatches(PyExc_Warning)) {
@ -4215,7 +4215,7 @@ sock_finalize(PySocketSockObject *s)
socket.getsockname(). If the socket is closed before, socket socket.getsockname(). If the socket is closed before, socket
methods fails with the EBADF error. */ methods fails with the EBADF error. */
fd = s->sock_fd; fd = s->sock_fd;
s->sock_fd = -1; s->sock_fd = INVALID_SOCKET;
/* We do not want to retry upon EINTR: see sock_close() */ /* We do not want to retry upon EINTR: see sock_close() */
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
@ -4275,7 +4275,7 @@ sock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
new = type->tp_alloc(type, 0); new = type->tp_alloc(type, 0);
if (new != NULL) { if (new != NULL) {
((PySocketSockObject *)new)->sock_fd = -1; ((PySocketSockObject *)new)->sock_fd = INVALID_SOCKET;
((PySocketSockObject *)new)->sock_timeout = _PyTime_FromSeconds(-1); ((PySocketSockObject *)new)->sock_timeout = _PyTime_FromSeconds(-1);
((PySocketSockObject *)new)->errorhandler = &set_error; ((PySocketSockObject *)new)->errorhandler = &set_error;
} }