Merge pull request #2580 from ItsVeryWindy/master

Updates to WebRequestHandler

mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest/WebRequestHandler.cs

@@ -42,6 +42,7 @@ public class WebRequestHandler : HttpClientHandler
 		int readWriteTimeout;
 		RemoteCertificateValidationCallback serverCertificateValidationCallback;
 		bool unsafeAuthenticatedConnectionSharing;
+		X509CertificateCollection clientCertificates;
 
 		public WebRequestHandler ()
 		{
@@ -54,6 +55,7 @@ public WebRequestHandler ()
 			readWriteTimeout = 300000;
 			serverCertificateValidationCallback = null;
 			unsafeAuthenticatedConnectionSharing = false;
+			clientCertificates = new X509CertificateCollection();
 		}
 
 		public bool AllowPipelining {
@@ -80,9 +82,14 @@ public WebRequestHandler ()
 			}
 		}
 
-		[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 @@ public WebRequestHandler ()
 			}
 		}
 
-		[MonoTODO]
 		public RemoteCertificateValidationCallback ServerCertificateValidationCallback {
 			get { return serverCertificateValidationCallback; }
 			set {
@@ -146,6 +152,11 @@ internal override HttpWebRequest CreateWebRequest (HttpRequestMessage request)
 			wr.MaximumResponseHeadersLength = maxResponseHeadersLength;
 			wr.ReadWriteTimeout = readWriteTimeout;
 			wr.UnsafeAuthenticatedConnectionSharing = unsafeAuthenticatedConnectionSharing;
+			wr.ServerCertificateValidationCallback = serverCertificateValidationCallback;
+
+			if (this.ClientCertificateOptions == ClientCertificateOption.Manual) {
+				wr.ClientCertificates = clientCertificates;
+			}
 
 			return wr;
 		}