Author: gonzalo
Date: 2005-02-28 20:22:09 -0500 (Mon, 28 Feb 2005)
New Revision: 41304

Modified:
   branches/mono-1-0/mcs/class/System/System.Net.Sockets/ChangeLog
   branches/mono-1-0/mcs/class/System/System.Net.Sockets/Socket.cs
Log:
2005-02-28 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * Socket.cs: don't block on Accept if the socket is non-blocking.
        Fixes bug #73053. Patch by Ankit Jain.



Modified: branches/mono-1-0/mcs/class/System/System.Net.Sockets/ChangeLog
===================================================================
--- branches/mono-1-0/mcs/class/System/System.Net.Sockets/ChangeLog     
2005-03-01 01:21:10 UTC (rev 41303)
+++ branches/mono-1-0/mcs/class/System/System.Net.Sockets/ChangeLog     
2005-03-01 01:22:09 UTC (rev 41304)
@@ -1,3 +1,8 @@
+2005-02-28 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * Socket.cs: don't block on Accept if the socket is non-blocking.
+       Fixes bug #73053. Patch by Ankit Jain.
+
 2004-12-28 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * Socket.cs: for Receive*/Send*, don't set the connected status to false

Modified: branches/mono-1-0/mcs/class/System/System.Net.Sockets/Socket.cs
===================================================================
--- branches/mono-1-0/mcs/class/System/System.Net.Sockets/Socket.cs     
2005-03-01 01:21:10 UTC (rev 41303)
+++ branches/mono-1-0/mcs/class/System/System.Net.Sockets/Socket.cs     
2005-03-01 01:22:09 UTC (rev 41304)
@@ -730,11 +730,6 @@
                        int error;
                        IntPtr sock=Accept_internal(socket, out error);
 
-                       if (!blocking && error == 10035) {
-                               Poll (-1, SelectMode.SelectRead);
-                               sock = Accept_internal (socket, out error);
-                       }
-
                        if (error != 0) {
                                throw new SocketException (error);
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to