commit 535f878e3d04c237e9dc7af2b14aad2bd92d13ec
author Mike Kaplinskiy <mike.kaplinskiy@gmail.com> Wed May 12 01:59:04 2010 -0400
committer Alexandre Julliard <julliard@winehq.org> Thu May 13 11:53:31 2010 +0200
tree 90ecb56bbfd15a38964f14245adbdb5ec816a0b9
parent f928580ac3fb8daa630904880d386978946fb4e8

server: Keep polling sockets after we got a 0 recv, but not for POLLIN.

server/sock.c

diff --git a/server/sock.c b/server/sock.c
index 753518d..da7ae67 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -428,13 +428,16 @@
             if (debug_level)
                 fprintf(stderr, "socket %p got OOB data\n", sock);
         }
+
         /* According to WS2 specs, FD_CLOSE is only delivered when there is
            no more data to be read (i.e. hangup_seen = 1) */
-        else if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) ))
+        if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) ))
         {
             sock->errors[FD_CLOSE_BIT] = sock_error( fd );
             if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) ))
                 sock->state &= ~FD_WRITE;
+            sock->state &= ~FD_READ;
+
             sock->pmask |= FD_CLOSE;
             sock->hmask |= FD_CLOSE;
             if (debug_level)
@@ -443,7 +446,7 @@
         }
     }
 
-    if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) )
+    if ( event & (POLLERR|POLLHUP) )
     {
         if ( debug_level )
             fprintf( stderr, "removing socket %p from select loop\n", sock );