2009-07-01 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* WebConnection.cs:
	* ServicePoint.cs: UseNagleAlgorithm determines NoDelay value.

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

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 5dc243da1aa99cdb7c039c31a9d014880645a246..edab53dc80a68d74fd9581fc1f9380c48191764e 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-01 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * WebConnection.cs:
+       * ServicePoint.cs: UseNagleAlgorithm determines NoDelay value.
+
 2009-06-28 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * HttpWebRequest.cs: fix 1.1 only test.

diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs
index f9bc2a7f148acaecabc39d65884e50fec3b11a12..3a7de6b3f5bca9cf2145497f9e6455c8ca06b361 100644 (file)
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -179,7 +179,6 @@ namespace System.Net
                        set { SendContinue = value; }
                }
 
-               [MonoTODO ("Use me")]
                public bool UseNagleAlgorithm {
                        get { return useNagle; }
                        set { useNagle = value; }

diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
index d33c9ba3f34c11217831472d65cef3a7e34f8f18..5fa4df4ad844111499a2e5cb9671a047a801df1a 100644 (file)
--- a/mcs/class/System/System.Net/WebConnection.cs
+++ b/mcs/class/System/System.Net/WebConnection.cs
@@ -147,8 +147,11 @@ namespace System.Net
 
                                        IPEndPoint remote = new IPEndPoint (address, sPoint.Address.Port);
 
+#if NET_1_1
+                                       socket.SetSocketOption (SocketOptionLevel.Tcp, SocketOptionName.NoDelay, !sPoint.UseNagleAlgorithm);
+#endif
 #if NET_2_0
-                                       socket.NoDelay = true;
+                                       socket.NoDelay = !sPoint.UseNagleAlgorithm;
                                        if (!sPoint.CallEndPointDelegate (socket, remote)) {
                                                socket.Close ();
                                                socket = null;