Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -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
@ -256,6 +256,12 @@ namespace System.Net
}
}
[MonoTODO]
public static bool ReusePort {
get { return false; }
set { throw new NotImplementedException (); }
}
public static SecurityProtocolType SecurityProtocol {
get { return _securityProtocol; }
set { _securityProtocol = value; }
@ -280,6 +286,13 @@ namespace System.Net
}
}
[MonoTODO ("Always returns EncryptionPolicy.RequireEncryption.")]
public static EncryptionPolicy EncryptionPolicy {
get {
return EncryptionPolicy.RequireEncryption;
}
}
public static bool Expect100Continue {
get { return expectContinue; }
set { expectContinue = value; }
@ -294,6 +307,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 +328,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 +369,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 ();