Skip to content

Make HTTP connection attempt cancellable #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Mar 9, 2017
Merged

Make HTTP connection attempt cancellable #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ string EncodeUrl (Uri url)
while (true) {
URL java_url = new URL (EncodeUrl (redirectState.NewUrl));
URLConnection java_connection = java_url.OpenConnection ();
HttpURLConnection httpConnection = await SetupRequestInternal (request, java_connection);
HttpResponseMessage response = await ProcessRequest (request, java_url, httpConnection, cancellationToken, redirectState);
HttpURLConnection httpConnection = await SetupRequestInternal (request, java_connection).ConfigureAwait (continueOnCapturedContext: false);;
HttpResponseMessage response = await ProcessRequest (request, java_url, httpConnection, cancellationToken, redirectState).ConfigureAwait (continueOnCapturedContext: false);;
if (response != null)
return response;

Expand All @@ -235,6 +235,19 @@ Task DisconnectAsync (HttpURLConnection httpConnection)
return Task.Run (() => httpConnection?.Disconnect ());
}

Task ConnectAsync (HttpURLConnection httpConnection, CancellationToken ct)
{
return Task.Run (() => {
try {
using (ct.Register (() => httpConnection?.Disconnect ()))
httpConnection?.Connect ();
} catch {
ct.ThrowIfCancellationRequested ();
throw;
}
}, ct);
}

async Task <HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, URL javaUrl, HttpURLConnection httpConnection, CancellationToken cancellationToken, RequestRedirectionState redirectState)
{
if (Logger.LogNet)
Expand All @@ -247,30 +260,18 @@ Task DisconnectAsync (HttpURLConnection httpConnection)
cancellationToken.ThrowIfCancellationRequested ();
}

CancellationTokenSource waitHandleSource = new CancellationTokenSource();
try {
if (Logger.LogNet)
Logger.Log (LogLevel.Info, LOG_APP, $" connecting");

CancellationToken linkedToken = CancellationTokenSource.CreateLinkedTokenSource(waitHandleSource.Token, cancellationToken).Token;
await Task.WhenAny (
httpConnection.ConnectAsync (),
Task.Run (()=> {
linkedToken.WaitHandle.WaitOne();
if (Logger.LogNet)
Logger.Log(LogLevel.Info, LOG_APP, $"Wait handle task finished");
}))
.ConfigureAwait(false);
await ConnectAsync (httpConnection, cancellationToken).ConfigureAwait (continueOnCapturedContext: false);
if (Logger.LogNet)
Logger.Log (LogLevel.Info, LOG_APP, $" connected");
} catch (Java.Net.ConnectException ex) {
if (Logger.LogNet)
Logger.Log (LogLevel.Info, LOG_APP, $"Connection exception {ex}");
// Wrap it nicely in a "standard" exception so that it's compatible with HttpClientHandler
throw new WebException (ex.Message, ex, WebExceptionStatus.ConnectFailure, null);
} finally{
//If not already cancelled, cancel the WaitOne through the waitHandleSource to prevent an orphaned thread
waitHandleSource.Cancel();
}

if (cancellationToken.IsCancellationRequested) {
Expand Down Expand Up @@ -541,7 +542,7 @@ void CopyHeaders (HttpURLConnection httpConnection, HttpResponseMessage response
/// <param name="conn">Pre-configured connection instance</param>
protected virtual Task SetupRequest (HttpRequestMessage request, HttpURLConnection conn)
{
return Task.Factory.StartNew (AssertSelf);
return Task.Run (AssertSelf);
}

/// <summary>
Expand Down Expand Up @@ -645,9 +646,9 @@ void AppendEncoding (string encoding, ref List <string> list)
}

HandlePreAuthentication (httpConnection);
await SetupRequest (request, httpConnection);
await SetupRequest (request, httpConnection).ConfigureAwait (continueOnCapturedContext: false);;
SetupRequestBody (httpConnection, request);

return httpConnection;
}

Expand Down