namespace System.Net.Http
{
- public class HttpClient : IDisposable
+ public class HttpClient : HttpMessageInvoker
{
static readonly TimeSpan TimeoutDefault = TimeSpan.FromSeconds (100);
Uri base_address;
- CancellationTokenSource cancellation_token;
+ CancellationTokenSource cts;
bool disposed;
- readonly HttpMessageHandler handler;
HttpRequestHeaders headers;
- int buffer_size;
+ long buffer_size;
TimeSpan timeout;
public HttpClient ()
- : this (null)
+ : this (new HttpClientHandler (), true)
{
}
-
+
public HttpClient (HttpMessageHandler handler)
+ : this (handler, true)
+ {
+ }
+
+ public HttpClient (HttpMessageHandler handler, bool disposeHandler)
+ : base (handler, disposeHandler)
{
- this.handler = handler ?? new HttpClientHandler ();
- buffer_size = 0x10000;
+ buffer_size = int.MaxValue;
timeout = TimeoutDefault;
+ cts = new CancellationTokenSource ();
}
public Uri BaseAddress {
}
}
- public int MaxResponseContentBufferSize {
+ public long MaxResponseContentBufferSize {
get {
return buffer_size;
}
public void CancelPendingRequests ()
{
- if (cancellation_token != null)
- cancellation_token.Cancel ();
-
- cancellation_token = new CancellationTokenSource ();
- }
-
- public void Dispose ()
- {
- Dispose (true);
+ // Cancel only any already running requests not any new request after this cancellation
+ using (var c = Interlocked.Exchange (ref cts, new CancellationTokenSource ()))
+ c.Cancel ();
}
-
- protected virtual void Dispose (bool disposing)
+
+ protected override void Dispose (bool disposing)
{
if (disposing && !disposed) {
disposed = true;
- if (cancellation_token != null)
- cancellation_token.Dispose ();
+ cts.Dispose ();
}
+
+ base.Dispose (disposing);
}
public Task<HttpResponseMessage> DeleteAsync (string requestUri)
public Task<HttpResponseMessage> GetAsync (string requestUri, CancellationToken cancellationToken)
{
- return SendAsync (new HttpRequestMessage (HttpMethod.Get, requestUri));
+ return SendAsync (new HttpRequestMessage (HttpMethod.Get, requestUri), cancellationToken);
}
public Task<HttpResponseMessage> GetAsync (string requestUri, HttpCompletionOption completionOption)
return SendAsync (request, completionOption, CancellationToken.None);
}
- public Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
+ public override Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
{
return SendAsync (request, HttpCompletionOption.ResponseContentRead, cancellationToken);
}
throw new InvalidOperationException ("The request URI must either be an absolute URI or BaseAddress must be set");
request.RequestUri = base_address;
+ } else if (!request.RequestUri.IsAbsoluteUri) {
+ if (base_address == null)
+ throw new InvalidOperationException ("The request URI must either be an absolute URI or BaseAddress must be set");
+
+ request.RequestUri = new Uri (base_address, request.RequestUri);
}
if (headers != null) {
request.Headers.AddHeaders (headers);
}
- return SendAsyncWorker (request, cancellationToken);
+ return SendAsyncWorker (request, completionOption, cancellationToken);
}
- async Task<HttpResponseMessage> SendAsyncWorker (HttpRequestMessage request, CancellationToken cancellationToken)
+ async Task<HttpResponseMessage> SendAsyncWorker (HttpRequestMessage request, HttpCompletionOption completionOption, CancellationToken cancellationToken)
{
- try {
- if (cancellation_token == null)
- cancellation_token = new CancellationTokenSource ();
+ using (var lcts = CancellationTokenSource.CreateLinkedTokenSource (cts.Token, cancellationToken)) {
+ lcts.CancelAfter (timeout);
- using (var cts = CancellationTokenSource.CreateLinkedTokenSource (cancellation_token.Token, cancellationToken)) {
- cts.CancelAfter (timeout);
+ var task = base.SendAsync (request, lcts.Token);
+ if (task == null)
+ throw new InvalidOperationException ("Handler failed to return a value");
+
+ var response = await task.ConfigureAwait (false);
+ if (response == null)
+ throw new InvalidOperationException ("Handler failed to return a response");
- var response = await handler.SendAsync (request, cts.Token).ConfigureAwait (false);
- if (response == null)
- throw new InvalidOperationException ("Handler failed to return a response");
-
- return response;
+ //
+ // Read the content when default HttpCompletionOption.ResponseContentRead is set
+ //
+ if (response.Content != null && (completionOption & HttpCompletionOption.ResponseHeadersRead) == 0) {
+ await response.Content.LoadIntoBufferAsync (MaxResponseContentBufferSize).ConfigureAwait (false);
}
- } finally {
- cancellation_token.Dispose ();
- cancellation_token = null;
+
+ return response;
}
}
public async Task<byte[]> GetByteArrayAsync (string requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsByteArrayAsync ();
+ using (var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false)) {
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsByteArrayAsync ().ConfigureAwait (false);
+ }
}
public async Task<byte[]> GetByteArrayAsync (Uri requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsByteArrayAsync ();
+ using (var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false)) {
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsByteArrayAsync ().ConfigureAwait (false);
+ }
}
public async Task<Stream> GetStreamAsync (string requestUri)
{
var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsStreamAsync ();
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsStreamAsync ().ConfigureAwait (false);
}
public async Task<Stream> GetStreamAsync (Uri requestUri)
{
var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsStreamAsync ();
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsStreamAsync ().ConfigureAwait (false);
}
public async Task<string> GetStringAsync (string requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsStringAsync ();
+ using (var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false)) {
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsStringAsync ().ConfigureAwait (false);
+ }
}
public async Task<string> GetStringAsync (Uri requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
- return await resp.Content.ReadAsStringAsync ();
+ using (var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false)) {
+ resp.EnsureSuccessStatusCode ();
+ return await resp.Content.ReadAsStringAsync ().ConfigureAwait (false);
+ }
}
}
}