server: Make sock_check_pollhup() more reliable on Solaris.

c4c03180 · Francois Gouget · Alexandre Julliard · 5d657bfd · c4c03180
Commit c4c03180 authored Nov 26, 2010 by Francois Gouget Committed by Alexandre Julliard Nov 29, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sock.c server/sock.c +2 -1

No files found.
--- a/server/sock.c
+++ b/server/sock.c
@@ -203,7 +203,8 @@ static sock_shutdown_t sock_check_pollhup(void)
    pfd.events = POLLIN;
    pfd.revents = 0;

-    n = poll( &pfd, 1, 0 );
+    /* Solaris' poll() sometimes returns nothing if given a 0ms timeout here */
+    n = poll( &pfd, 1, 1 );
    if ( n != 1 ) goto out; /* error or timeout */
    if ( pfd.revents & POLLHUP )
        ret = SOCK_SHUTDOWN_POLLHUP;