Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -42,6 +42,7 @@ namespace System.Net.Http
int readWriteTimeout;
RemoteCertificateValidationCallback serverCertificateValidationCallback;
bool unsafeAuthenticatedConnectionSharing;
X509CertificateCollection clientCertificates;
public WebRequestHandler ()
{
@ -54,6 +55,7 @@ namespace System.Net.Http
readWriteTimeout = 300000;
serverCertificateValidationCallback = null;
unsafeAuthenticatedConnectionSharing = false;
clientCertificates = new X509CertificateCollection();
}
public bool AllowPipelining {
@ -80,9 +82,14 @@ namespace System.Net.Http
}
}
[MonoTODO]
public X509CertificateCollection ClientCertificates {
get { throw new NotImplementedException (); }
get {
if (this.ClientCertificateOptions != ClientCertificateOption.Manual) {
throw new InvalidOperationException("The ClientCertificateOptions property must be set to 'Manual' to use this property.");
}
return clientCertificates;
}
}
[MonoTODO]
@ -118,7 +125,6 @@ namespace System.Net.Http
}
}
[MonoTODO]
public RemoteCertificateValidationCallback ServerCertificateValidationCallback {
get { return serverCertificateValidationCallback; }
set {
@ -146,6 +152,11 @@ namespace System.Net.Http
wr.MaximumResponseHeadersLength = maxResponseHeadersLength;
wr.ReadWriteTimeout = readWriteTimeout;
wr.UnsafeAuthenticatedConnectionSharing = unsafeAuthenticatedConnectionSharing;
wr.ServerCertificateValidationCallback = serverCertificateValidationCallback;
if (this.ClientCertificateOptions == ClientCertificateOption.Manual) {
wr.ClientCertificates = clientCertificates;
}
return wr;
}