Merge the trivial portion of r74426 from trunk.

socket.sendall() now handles EINTR properly internally.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7b6046dbc6ead548bfd25d7a6d5df69da51af895..fa543cdab9bc01e158403173baa89d117aa6a74e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2572,8 +2572,21 @@ sock_sendall(PySocketSockObject *s, PyObject *args)
 #else
                n = send(s->sock_fd, buf, len, flags);
 #endif
-               if (n < 0)
+               if (n < 0) {
+#ifdef EINTR
+                       /* We must handle EINTR here as there is no way for
+                        * the caller to know how much was sent otherwise.  */
+                       if (errno == EINTR) {
+                               /* Run signal handlers.  If an exception was
+                                * raised, abort and leave this socket in
+                                * an unknown state. */
+                               if (PyErr_CheckSignals())
+                                       return NULL;
+                               continue;
+                       }
+#endif
                        break;
+               }
                buf += n;
                len -= n;
        } while (len > 0);