Merge remote-tracking branch 'origin/pr/680'

2026-06-28 22:06:38 +02:00 · 2016-02-07 11:07:47 +01:00
parent bd2e43146e b12412ed17
commit 239cf632cd
1 changed files with 8 additions and 3 deletions
@@ -368,9 +368,14 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
        ready = poll (&poll_fd, 1, -1);
        if (ready <= 0)
        {
-            xfer_network_write_pipe (xfer, XFER_STATUS_FAILED,
-                                     XFER_ERROR_RECV_BLOCK);
-            return;
+            if ((errno == EINTR) || (errno == EAGAIN))
+                continue;
+            else
+            {
+                xfer_network_write_pipe (xfer, XFER_STATUS_FAILED,
+                                         XFER_ERROR_RECV_BLOCK);
+                return;
+            }
        }

        /* read maximum data on socket (until nothing is available) */