2002-11-09 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Socket.cs: offset == size == 0 it's ok in Send ().

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

2 files changed, 22 insertions, 17 deletions

diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog
index a67abc03f6a..967ff252f3f 100644
--- a/mcs/class/System/System.Net.Sockets/ChangeLog
+++ b/mcs/class/System/System.Net.Sockets/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Socket.cs: offset == size == 0 it's ok in Send ().
+
 2002-11-03  Phillip Pearson  <pp@myelin.co.nz>
 
 	* TcpClient.cs: Fixed SetTcpClient() to pass through to the Client 
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index a9ebb84021e..08478caade1 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -812,30 +812,31 @@ namespace System.Net.Sockets
 							int count,
 							SocketFlags flags);
 
-		public int Send(byte[] buf, int offset, int size,
-				SocketFlags flags) {
-			if(buf==null) {
-				throw new ArgumentNullException("buffer is null");
-			}
-			if(offset<0 || offset>=buf.Length) {
-				throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
-			}
-			if(offset+size<0 || offset+size>buf.Length) {
-				throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
-			}
+		public int Send (byte[] buf, int offset, int size, SocketFlags flags)
+		{
+			if (buf == null)
+				throw new ArgumentNullException ("buffer");
+
+			if (offset < 0 || offset > buf.Length)
+				throw new ArgumentOutOfRangeException ("offset");
+
+			if (size < 0 || offset + size > buf.Length)
+				throw new ArgumentOutOfRangeException ("size");
+
+			if (size == 0)
+				return 0;
 
 			int ret;
 
 			try {
-				ret=Send_internal(socket, buf, offset, size,
-						  flags);
-			} catch(SocketException) {
-				connected=false;
+				ret = Send_internal (socket, buf, offset, size, flags);
+			} catch (SocketException) {
+				connected = false;
 				throw;
 			}
-			connected=true;
+			connected = true;
 
-			return(ret);
+			return ret;
 		}
 
 		public int SendTo(byte[] buffer, EndPoint remote_end) {