More cancellation checks

Author: grendello

src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.Legacy.cs

@@ -361,6 +361,7 @@ Task ConnectAsync (HttpURLConnection httpConnection, CancellationToken ct)
 		protected virtual async Task WriteRequestContentToOutput (HttpRequestMessage request, HttpURLConnection httpConnection, CancellationToken cancellationToken)
 		{
 			using (var stream = await request.Content.ReadAsStreamAsync ().ConfigureAwait (false)) {
+				cancellationToken.ThrowIfCancellationRequested ();
 				try {
 					await stream.CopyToAsync(httpConnection.OutputStream!, 4096, cancellationToken).ConfigureAwait(false);
 				} catch (ObjectDisposedException ex) {
@@ -387,6 +388,7 @@ protected virtual async Task WriteRequestContentToOutput (HttpRequestMessage req
 				// See https://bugzilla.xamarin.com/show_bug.cgi?id=55477
 				//
 				if (stream.CanSeek) {
+					cancellationToken.ThrowIfCancellationRequested ();
 					try {
 						stream.Seek (0, SeekOrigin.Begin);
 					} catch (ObjectDisposedException ex) {

src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs

@@ -537,7 +537,6 @@ protected virtual async Task WriteRequestContentToOutput (HttpRequestMessage req
 				return;
 
 			using (var stream = await request.Content.ReadAsStreamAsync ().ConfigureAwait (false)) {
-				await stream.CopyToAsync(httpConnection.OutputStream!, 4096, cancellationToken).ConfigureAwait(false);
 				cancellationToken.ThrowIfCancellationRequested ();
 				try {
 					await stream.CopyToAsync(httpConnection.OutputStream!, 4096, cancellationToken).ConfigureAwait(false);
@@ -565,6 +564,7 @@ protected virtual async Task WriteRequestContentToOutput (HttpRequestMessage req
 				// See https://bugzilla.xamarin.com/show_bug.cgi?id=55477
 				//
 				if (stream.CanSeek) {
+					cancellationToken.ThrowIfCancellationRequested ();
 					try {
 						stream.Seek (0, SeekOrigin.Begin);
 					} catch (ObjectDisposedException ex) {