From c4c03180b0868fe93de4a5ccf52ba76bb00ffcab Mon Sep 17 00:00:00 2001 From: Francois Gouget <fgouget@free.fr> Date: Fri, 26 Nov 2010 18:08:30 +0100 Subject: [PATCH] server: Make sock_check_pollhup() more reliable on Solaris. --- server/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 04ae7480e5b..d37a316a68a 100644 --- 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; -- GitLab