server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB.
2daf7643 · Zebediah Figura · Alexandre Julliard · 69549fc0 · 2daf7643
Commit 2daf7643 authored Jun 15, 2021 by Zebediah Figura Committed by Alexandre Julliard Jun 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

sock.c server/sock.c +14 -5

No files found.
--- a/server/sock.c
+++ b/server/sock.c
@@ -1063,11 +1063,20 @@ static int sock_get_poll_events( struct fd *fd )
        {
            if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI;
        }
-        else if (!sock->rd_shutdown && (mask & AFD_POLL_READ))
+        else
-            ev |= POLLIN | POLLPRI;
+        {
-        /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */
+            if (!sock->rd_shutdown)
-        else if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ))
+            {
-            ev |= POLLIN;
+                if (mask & AFD_POLL_READ)
+                    ev |= POLLIN;
+                if (mask & AFD_POLL_OOB)
+                    ev |= POLLPRI;
+            }
+            /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */
+            if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ))
+                ev |= POLLIN;
+        }
        if (async_queued( &sock->write_q ))
        {