Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -112,8 +112,8 @@ namespace System.Net
int maxResponseHeadersLength;
static int defaultMaxResponseHeadersLength;
int readWriteTimeout = 300000; // ms
IMonoTlsProvider tlsProvider;
#if SECURITY_DEP
MonoTlsProvider tlsProvider;
MonoTlsSettings tlsSettings;
#endif
ServerCertValidationCallback certValidationCallback;
@ -161,7 +161,7 @@ namespace System.Net
}
#if SECURITY_DEP
internal HttpWebRequest (Uri uri, IMonoTlsProvider tlsProvider, MonoTlsSettings settings = null)
internal HttpWebRequest (Uri uri, MonoTlsProvider tlsProvider, MonoTlsSettings settings = null)
: this (uri)
{
this.tlsProvider = tlsProvider;
@ -274,16 +274,16 @@ namespace System.Net
}
}
internal IMonoTlsProvider TlsProvider {
#if SECURITY_DEP
internal MonoTlsProvider TlsProvider {
get { return tlsProvider; }
}
#if SECURITY_DEP
internal MonoTlsSettings TlsSettings {
get { return tlsSettings; }
}
#endif
public X509CertificateCollection ClientCertificates {
get {
if (certificates == null)