commit ff1f320ac826ec39ebe8a2088e11398a29471261
author Martin Wilck <Martin.Wilck@fujitsu-siemens.com> Fri Apr 26 18:31:19 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 26 18:31:19 2002 +0000
tree 01fa22edff897a5dd206fc1a621996ca0cc3cc33
parent b0b3c385e1e917fea41105a50e35aeb5138c9e30

Fixed some bugs in my recently submitted patch series.

server/sock.c

diff --git a/server/sock.c b/server/sock.c
index d8362af..b102a5b 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -250,7 +250,6 @@
             sock->errors[FD_CONNECT_BIT] = sock_error( sock->obj.fd );
             if (debug_level)
                 fprintf(stderr, "socket %d connection failure\n", sock->obj.fd);
-            set_select_events( &sock->obj, -1 );
         }
     } else
     if (sock->state & FD_WINE_LISTENING)
@@ -269,7 +268,6 @@
             sock->pmask |= FD_ACCEPT;
             sock->errors[FD_ACCEPT_BIT] = sock_error( sock->obj.fd );
             sock->hmask |= FD_ACCEPT;
-            set_select_events( &sock->obj, -1 );
         }
     } else
     {
@@ -335,11 +333,17 @@
             if (debug_level)
                 fprintf(stderr, "socket %d aborted by error %d, event: %x - removing from select loop\n",
                         sock->obj.fd, sock->errors[FD_CLOSE_BIT], event);
-            set_select_events( &sock->obj, -1 );
         }
     }
 
-    sock_reselect( sock );
+    if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) )
+    {
+        if ( debug_level )
+            fprintf ( stderr, "removing socket %d from select loop\n", sock->obj.fd );
+        set_select_events( &sock->obj, -1 );
+    }
+    else
+        sock_reselect( sock );
 
     /* wake up anyone waiting for whatever just happened */
     if ( sock->pmask & sock->mask || sock->flags & FD_FLAG_OVERLAPPED ) sock_wake_up( sock, event );