X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem%2FSystem.Net%2FServicePointManager.cs;h=17308253af502c5f6d2c134ba11acb2a0e4be2c8;hb=fcca9846c82626dd094b2ca0c5f35991f8afc3a5;hp=abd23e67270d619d6b6435ca104187a9be488401;hpb=f9596050629ebf0d8d24fb256cc08f98d6d2c7e7;p=mono.git

diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs
index abd23e67270..17308253af5 100644
--- a/mcs/class/System/System.Net/ServicePointManager.cs
+++ b/mcs/class/System/System.Net/ServicePointManager.cs
@@ -132,20 +132,20 @@ namespace System.Net
 		// Fields
 		
 		public const int DefaultNonPersistentConnectionLimit = 4;
-#if MONOTOUCH
+#if MOBILE
 		public const int DefaultPersistentConnectionLimit = 10;
 #else
 		public const int DefaultPersistentConnectionLimit = 2;
 #endif
 
-#if !NET_2_1
+#if !MOBILE
 		const string configKey = "system.net/connectionManagement";
 		static ConnectionManagementData manager;
 #endif
 		
 		static ServicePointManager ()
 		{
-#if !NET_2_1
+#if !MOBILE
 #if CONFIGURATION_DEP
 			object cfg = ConfigurationManager.GetSection (configKey);
 			ConnectionManagementSection s = cfg as ConnectionManagementSection;
@@ -200,7 +200,7 @@ namespace System.Net
 					throw new ArgumentOutOfRangeException ("value");
 
 				defaultConnectionLimit = value; 
-#if !NET_2_1
+#if !MOBILE
                 if (manager != null)
 					manager.Add ("*", defaultConnectionLimit);
 #endif
@@ -294,6 +294,10 @@ namespace System.Net
 			get { return false; }
 		}
 
+		internal static bool DisableSendAuxRecord {
+			get { return false; }
+		}
+
 		// Methods
 		public static void SetTcpKeepAlive (bool enabled, int keepAliveTime, int keepAliveInterval)
 		{
@@ -311,7 +315,7 @@ namespace System.Net
 
 		public static ServicePoint FindServicePoint (Uri address) 
 		{
-			return FindServicePoint (address, GlobalProxySelection.Select);
+			return FindServicePoint (address, null);
 		}
 		
 		public static ServicePoint FindServicePoint (string uriString, IWebProxy proxy)
@@ -352,7 +356,7 @@ namespace System.Net
 					throw new InvalidOperationException ("maximum number of service points reached");
 
 				int limit;
-#if NET_2_1
+#if MOBILE
 				limit = defaultConnectionLimit;
 #else
 				string addr = address.ToString ();