Mercurial > cpython-lru_cache-weakref

diff Modules/socketmodule.c @ 39354:85fdcdfca85c legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during a socket operation on a socket with a timeout, the exception will be caught correctly. Previously, the exception was not caught.
author Neal Norwitz <nnorwitz@gmail.com>
date Wed, 02 Aug 2006 06:46:21 +0000
parents c4ac6ea497a1
children 799bcf0ccbfd
line wrap: on
line diff
--- a/Modules/socketmodule.c	Wed Aug 02 06:19:19 2006 +0000
+++ b/Modules/socketmodule.c	Wed Aug 02 06:46:21 2006 +0000
@@ -708,7 +708,7 @@
    The argument writing indicates the direction.
    This does not raise an exception; we'll let our caller do that
    after they've reacquired the interpreter lock.
-   Returns 1 on timeout, 0 otherwise. */
+   Returns 1 on timeout, -1 on error, 0 otherwise. */
 static int
 internal_select(PySocketSockObject *s, int writing)
 {
@@ -753,6 +753,9 @@
 			n = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
 	}
 #endif
+	
+	if (n < 0)
+		return -1;
 	if (n == 0)
 		return 1;
 	return 0;
@@ -1552,7 +1555,7 @@
 			       &addrlen);
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return NULL;
 	}
@@ -1923,9 +1926,15 @@
 	if (s->sock_timeout > 0.0) {
 		if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
 			timeout = internal_select(s, 1);
-			res = connect(s->sock_fd, addr, addrlen);
-			if (res < 0 && errno == EISCONN)
-				res = 0;
+			if (timeout == 0) {
+				res = connect(s->sock_fd, addr, addrlen);
+				if (res < 0 && errno == EISCONN)
+					res = 0;
+			}
+			else if (timeout == -1)
+				res = errno;		/* had error */
+			else
+				res = EWOULDBLOCK;	/* timed out */
 		}
 	}
 
@@ -1955,7 +1964,7 @@
 	res = internal_connect(s, addr, addrlen, &timeout);
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return NULL;
 	}
@@ -1989,6 +1998,13 @@
 	res = internal_connect(s, addr, addrlen, &timeout);
 	Py_END_ALLOW_THREADS
 
+	/* Signals are not errors (though they may raise exceptions).  Adapted
+	   from PyErr_SetFromErrnoWithFilenameObject(). */
+#ifdef EINTR
+	if (res == EINTR && PyErr_CheckSignals())
+		return NULL;
+#endif
+
 	return PyInt_FromLong((long) res);
 }
 
@@ -2209,10 +2225,10 @@
 static ssize_t
 sock_recv_guts(PySocketSockObject *s, char* cbuf, int len, int flags)
 {
-        ssize_t outlen = 0;
+        ssize_t outlen = -1;
         int timeout;
 #ifdef __VMS
-	int remaining, nread;
+	int remaining;
 	char *read_buf;
 #endif
 
@@ -2228,7 +2244,7 @@
 		outlen = recv(s->sock_fd, cbuf, len, flags);
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return -1;
 	}
@@ -2243,6 +2259,7 @@
 	remaining = len;
 	while (remaining != 0) {
 		unsigned int segment;
+		int nread = -1;
 
 		segment = remaining /SEGMENT_SIZE;
 		if (segment != 0) {
@@ -2258,7 +2275,7 @@
 			nread = recv(s->sock_fd, read_buf, segment, flags);
 		Py_END_ALLOW_THREADS
 
-		if (timeout) {
+		if (timeout == 1) {
 			PyErr_SetString(socket_timeout, "timed out");
 			return -1;
 		}
@@ -2406,7 +2423,7 @@
 {
 	sock_addr_t addrbuf;
 	int timeout;
-	ssize_t n = 0;
+	ssize_t n = -1;
 	socklen_t addrlen;
 
 	*addr = NULL;
@@ -2438,7 +2455,7 @@
 	}
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return -1;
 	}
@@ -2553,7 +2570,7 @@
 sock_send(PySocketSockObject *s, PyObject *args)
 {
 	char *buf;
-	int len, n = 0, flags = 0, timeout;
+	int len, n = -1, flags = 0, timeout;
 
 	if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
 		return NULL;
@@ -2571,7 +2588,7 @@
 #endif
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return NULL;
 	}
@@ -2594,7 +2611,7 @@
 sock_sendall(PySocketSockObject *s, PyObject *args)
 {
 	char *buf;
-	int len, n = 0, flags = 0, timeout;
+	int len, n = -1, flags = 0, timeout;
 
 	if (!PyArg_ParseTuple(args, "s#|i:sendall", &buf, &len, &flags))
 		return NULL;
@@ -2605,6 +2622,7 @@
 	Py_BEGIN_ALLOW_THREADS
 	do {
 		timeout = internal_select(s, 1);
+		n = -1;
 		if (timeout)
 			break;
 #ifdef __VMS
@@ -2619,7 +2637,7 @@
 	} while (len > 0);
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return NULL;
 	}
@@ -2647,7 +2665,7 @@
 	PyObject *addro;
 	char *buf;
 	struct sockaddr *addr;
-	int addrlen, len, n = 0, flags, timeout;
+	int addrlen, len, n = -1, flags, timeout;
 
 	flags = 0;
 	if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {
@@ -2669,7 +2687,7 @@
 		n = sendto(s->sock_fd, buf, len, flags, addr, addrlen);
 	Py_END_ALLOW_THREADS
 
-	if (timeout) {
+	if (timeout == 1) {
 		PyErr_SetString(socket_timeout, "timed out");
 		return NULL;
 	}