Skip to content

W
wine-cw
Commit 333313aa authored by Mike Kaplinskiy's avatar Mike Kaplinskiy Committed by Alexandre Julliard
Browse files
Options

server: Allow queuing async reads on listening sockets.

parent ae5ad61f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
server/sock.c
View file @ 333313aa
......@@ -492,15 +492,12 @@ static int sock_get_poll_events( struct fd *fd )
if (sock->state & FD_CONNECT)
/* connecting, wait for writable */
return POLLOUT;
if (sock->state & FD_WINE_LISTENING)
/* listening, wait for readable */
return (mask & FD_ACCEPT) ? POLLIN : 0;
if ( async_queued( sock->read_q ) )
{
if ( async_waiting( sock->read_q ) ) ev |= POLLIN | POLLPRI;
}
else if (smask & FD_READ)
else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT))
ev |= POLLIN | POLLPRI;
/* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */
else if ( sock->type == SOCK_STREAM && sock->state & FD_READ && mask & FD_CLOSE &&
......@@ -545,7 +542,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type,
return;
}
if ( ( !( sock->state & (FD_READ|FD_CONNECT) ) && type == ASYNC_TYPE_READ ) ||
if ( ( !( sock->state & (FD_READ|FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) ||
( !( sock->state & (FD_WRITE|FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) )
{
set_error( STATUS_PIPE_DISCONNECTED );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment