Module: wine Branch: master Commit: 0601c86542b16c452c014d5a9a3d6d57e6476796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0601c86542b16c452c014d5a9a...
Author: Michael Müller michael@fds-team.de Date: Sat Mar 28 20:47:52 2015 +0100
ws2_32: Don't return an error in WS_select when EINTR happens during timeout.
---
dlls/ws2_32/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7f3134e..9d5067a 100644 --- 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 );