Merge pull request #1404 from woodsb02/mono-route

[mono.git] / mcs / class / System.Net.Http / System.Net.Http / HttpClient.cs

diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
index 1e1fcbf1021ffd69ea9e7814a9b69bbffec4c2c5..fc17d4cc95b464a717861d416a4595340e790892 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
@@ -146,7 +146,7 @@ namespace System.Net.Http
 
                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)
@@ -303,14 +303,14 @@ namespace System.Net.Http
 
                public async Task<Stream> GetStreamAsync (string requestUri)
                {
-                       var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
+                       var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (false);
                        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);
+                       var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (false);
                        resp.EnsureSuccessStatusCode ();
                        return await resp.Content.ReadAsStreamAsync ().ConfigureAwait (false);
                }