ws2_32: Don't return an error in WS_select when EINTR happens during timeout.

0601c865 · Michael Müller · Alexandre Julliard · 4b18b0d1 · 0601c865
Commit 0601c865 authored Mar 28, 2015 by Michael Müller Committed by Alexandre Julliard Apr 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

socket.c dlls/ws2_32/socket.c +5 -1

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4780,7 +4780,11 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds,
            }

            timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000;
-            if (timeout <= 0) break;
+            if (timeout <= 0)
+            {
+                ret = 0;
+                break;
+            }
        } else break;
    }
    release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds );