Implement webrequest cancellation. Fixes #13200

1 files changed, 16 insertions, 2 deletions

diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
index 720fc6812a6..656911ee0e2 100644
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
@@ -312,8 +312,22 @@ namespace System.Net.Http
 				await request.Content.CopyToAsync (stream).ConfigureAwait (false);
 			}
 
-			// FIXME: GetResponseAsync does not accept cancellationToken
-			var wresponse = (HttpWebResponse) await wrequest.GetResponseAsync ().ConfigureAwait (false);
+			HttpWebResponse wresponse = null;
+			using (cancellationToken.Register (l => ((HttpWebRequest) l).Abort (), wrequest)) {
+				try {
+					wresponse = (HttpWebResponse) await wrequest.GetResponseAsync ().ConfigureAwait (false);
+				} catch (WebException we) {
+					if (we.Status != WebExceptionStatus.RequestCanceled)
+						throw;
+				}
+
+				if (cancellationToken.IsCancellationRequested) {
+					var cancelled = new TaskCompletionSource<HttpResponseMessage> ();
+					cancelled.SetCanceled ();
+					return await cancelled.Task;
+				}
+			}
+			
 			return CreateResponseMessage (wresponse, request);
 		}
 	}