Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/System/ReferenceSources/CAPI.cs

@@ -27,8 +27,6 @@ namespace System.Security.Cryptography {
 				return "md2RSA";
 			case "1.2.840.113549.1.1.3":
 				return "md4RSA";
-				return "md4RSA";
-				return "md4RSA";
 			case "1.3.14.3.2.27":
 				return "dsaSHA1";
 			case "2.16.840.1.101.2.1.1.19":

mcs/class/System/ReferenceSources/Logging.cs

@@ -1,12 +1,9 @@
 using System.Diagnostics;
 
 namespace System.Net {
-	class Logging {
-		internal static bool On {
-			get {
-				return false;
-			}
-		}
+	static class Logging
+	{
+		internal static readonly bool On = false;
 
 		internal static TraceSource Web {
 			get {
@@ -20,6 +17,12 @@ namespace System.Net {
 			}
 		}
 
+		internal static TraceSource Sockets {
+			get {
+				return null;
+			}
+		}
+
 		[Conditional ("TRACE")]
 		internal static void Enter(TraceSource traceSource, object obj, string method, object paramObject) {
 		}
@@ -28,6 +31,10 @@ namespace System.Net {
 		internal static void Enter(TraceSource traceSource, string msg) {
 		}
 
+		[Conditional ("TRACE")]
+		internal static void Enter(TraceSource traceSource, string msg, string parameters) {
+		}
+
 		[Conditional ("TRACE")]
 		internal static void Exception(TraceSource traceSource, object obj, string method, Exception e) {
 		}
@@ -40,6 +47,10 @@ namespace System.Net {
 		internal static void Exit(TraceSource traceSource, string msg) {
 		}
 
+		[Conditional ("TRACE")]
+		internal static void Exit(TraceSource traceSource, string msg, string parameters) {
+		}
+
 		[Conditional ("TRACE")]
 		internal static void PrintInfo(TraceSource traceSource, object obj, string method, string msg) {
 		}

mcs/class/System/ReferenceSources/SettingsSectionInternal.cs

@@ -1,4 +1,5 @@
 using System.Net.Security;
+using System.Net.Sockets;
 
 namespace System.Net.Configuration {
 	sealed class SettingsSectionInternal
@@ -16,8 +17,8 @@ namespace System.Net.Configuration {
 		internal UnicodeDecodingConformance WebUtilityUnicodeDecodingConformance = UnicodeDecodingConformance.Auto;
 #endif
 
-		internal bool HttpListenerUnescapeRequestUrl = true;
-
+		internal readonly bool HttpListenerUnescapeRequestUrl = true;
+		internal readonly IPProtectionLevel IPProtectionLevel = IPProtectionLevel.Unspecified;
 
 		internal bool UseNagleAlgorithm { get; set; }
 		internal bool Expect100Continue { get; set; }
@@ -26,5 +27,20 @@ namespace System.Net.Configuration {
 		internal bool EnableDnsRoundRobin { get; set; }
 		internal bool CheckCertificateRevocationList { get; set; }
 		internal EncryptionPolicy EncryptionPolicy { get; private set; }
+
+		internal bool Ipv6Enabled {
+			get {
+#if CONFIGURATION_DEP && !MOBILE
+				try {
+					var config = (SettingsSection) System.Configuration.ConfigurationManager.GetSection ("system.net/settings");
+					if (config != null)
+						return config.Ipv6.Enabled;
+				} catch {
+				}
+#endif
+
+				return true;
+			}
+		}
 	}
 }

mcs/class/System/ReferenceSources/Socket.cs

@@ -37,10 +37,10 @@ namespace System.Net.Sockets
 		// this version does not throw.
 		internal void InternalShutdown (SocketShutdown how)
 		{
-			if (!is_connected || is_disposed)
+			if (!is_connected || CleanedUp)
 				return;
 			int error;
-			Shutdown_internal (safe_handle, how, out error);
+			Shutdown_internal (m_Handle, how, out error);
 		}
 
 		internal IAsyncResult UnsafeBeginConnect (EndPoint remoteEP, AsyncCallback callback, object state)
@@ -86,7 +86,7 @@ namespace System.Net.Sockets
 
 		internal void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue, bool silent)
 		{
-			if (is_disposed && is_closed) {
+			if (CleanedUp && is_closed) {
 				if (silent)
 					return;
 				throw new ObjectDisposedException (GetType ().ToString ());
@@ -94,56 +94,11 @@ namespace System.Net.Sockets
 
 			int error;
 
-			SetSocketOption_internal (safe_handle, optionLevel, optionName, null,
+			SetSocketOption_internal (m_Handle, optionLevel, optionName, null,
 				null, optionValue, out error);
 
 			if (!silent && error != 0)
 				throw new SocketException (error);
 		}
-
-        internal bool CanTryAddressFamily (AddressFamily family)
-        {
-			return (family == address_family) || (family == AddressFamily.InterNetwork && IsDualMode);
-        }
-
-        public static bool ConnectAsync(SocketType socketType, ProtocolType protocolType, SocketAsyncEventArgs e) {
-
-            bool retval;
-
-            // Throw if multiple buffers specified.
-            if (e.m_BufferList != null) {
-                throw new ArgumentException(SR.GetString(SR.net_multibuffernotsupported), "BufferList");
-            }
-
-            // Throw if RemoteEndPoint is null.
-            if (e.RemoteEndPoint == null) {
-                throw new ArgumentNullException("remoteEP");
-            }
-
-            EndPoint endPointSnapshot = e.RemoteEndPoint;
-            DnsEndPoint dnsEP = endPointSnapshot as DnsEndPoint;
-
-            if (dnsEP != null) {
-                Socket attemptSocket = null;
-                MultipleConnectAsync multipleConnectAsync = null;
-                if (dnsEP.AddressFamily == AddressFamily.Unspecified) {
-                    multipleConnectAsync = new MultipleSocketMultipleConnectAsync(socketType, protocolType);
-                } else {
-                    attemptSocket = new Socket(dnsEP.AddressFamily, socketType, protocolType);
-                    multipleConnectAsync = new SingleSocketMultipleConnectAsync(attemptSocket, false);
-                }
-
-                e.StartOperationCommon(attemptSocket);
-                e.StartOperationWrapperConnect(multipleConnectAsync);
-
-                retval = multipleConnectAsync.StartConnectAsync(e, dnsEP);
-            } else {
-                Socket attemptSocket = new Socket(endPointSnapshot.AddressFamily, socketType, protocolType);
-                retval = attemptSocket.ConnectAsync(e);
-            }
-
-            return retval;
-        }
-
 	}
 }

mcs/class/System/ReferenceSources/Win32Exception.cs

@@ -1,15 +0,0 @@
-using System.Runtime.CompilerServices;
-
-namespace System.ComponentModel
-{
-	partial class Win32Exception
-	{
-		[MethodImplAttribute (MethodImplOptions.InternalCall)]
-		internal static extern string W32ErrorMessage (int error_code);
-
-		private static string GetErrorMessage (int error)
-		{
-			return W32ErrorMessage (error);
-		}
-	}
-}

mcs/class/System/ReferenceSources/Win32Exception.cs.REMOVED.git-id

@@ -0,0 +1 @@
+fe514b868d2ddd7479dee6238a5848350be33611