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>
This commit is contained in:
parent
69549fc0c7
commit
2daf76432e
|
@ -1063,11 +1063,20 @@ static int sock_get_poll_events( struct fd *fd )
|
||||||
{
|
{
|
||||||
if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI;
|
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 ))
|
if (async_queued( &sock->write_q ))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue