2004-05-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Socket.cs: fix for BeginConnect and non-blocking sockets.

svn path=/trunk/mcs/; revision=26636

2 files changed, 17 insertions, 3 deletions

diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog
index ae8e82ce52d..3d500209970 100644
--- a/mcs/class/System/System.Net.Sockets/ChangeLog
+++ b/mcs/class/System/System.Net.Sockets/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Socket.cs: fix for BeginConnect and non-blocking sockets.
+
 2004-05-03  Lluis Sanchez Gual <lluis@ximian.com>
 
 	* Socket.cs: Use assembly name const to load Mono.Posix.
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index 6c91f6b31fc..fdcdfd4cdbf 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -186,10 +186,20 @@ namespace System.Net.Sockets
 			{
 				lock (result) {
 					try {
-						if (!result.Sock.blocking)
-							result.Sock.Poll (-1, SelectMode.SelectWrite);
-
 						result.Sock.Connect (result.EndPoint);
+					} catch (SocketException se) {
+						if (result.Sock.blocking || se.ErrorCode != 10036) {
+							result.Complete (se);
+							return;
+						}
+						
+						try {
+							result.Sock.Poll (-1, SelectMode.SelectWrite);
+							result.Sock.Connect (result.EndPoint);
+						} catch (Exception k) {
+							result.Complete (k);
+							return;
+						}
 					} catch (Exception e) {
 						result.Complete (e);
 						return;