poll: return immediately on POLLHUP.

* lib/poll.c (poll): Always set timeout before wait_timeout is
computed.
(cherry picked from commit 0a051206787d83314ac69cf4c8857c0e880feaed)

diff --git a/ChangeLog b/ChangeLog
index ab5eccc..836f553 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-26  Erik Faye-Lund  <kusmabite@gmail.com>
+
+       poll: return immediately on POLLHUP.
+       * lib/poll.c (poll): Always set timeout before wait_timeout is
+       computed.
+
 2010-08-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix test-unlinkat, test-rmdir failure on AIX 5.3.

diff --git a/lib/poll.c b/lib/poll.c
index aeb7a35..7c52cb6 100644 (file)
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -505,7 +505,7 @@ poll (pfd, nfd, timeout)
           if (sought)
             handle_array[nhandles++] = h;
           if (pfd[i].revents)
-            wait_timeout = 0;
+            timeout = 0;
         }
     }