Merge pull request #2223 from lobrien/master

[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..baa6dd9f0d26cc6a219c5187164013043009be9d 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
@@ -33,7 +33,7 @@ using System.IO;
 
 namespace System.Net.Http
 {
-       public class HttpClient : HttpMessageInvoker
+       public partial class HttpClient : HttpMessageInvoker
        {
                static readonly TimeSpan TimeoutDefault = TimeSpan.FromSeconds (100);
 
@@ -44,10 +44,12 @@ namespace System.Net.Http
                long buffer_size;
                TimeSpan timeout;
 
+#if !XAMARIN_MODERN
                public HttpClient ()
                        : this (new HttpClientHandler (), true)
                {
                }
+#endif
                
                public HttpClient (HttpMessageHandler handler)
                        : this (handler, true)
@@ -146,7 +148,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)
@@ -242,16 +244,17 @@ namespace System.Net.Http
                        if (request.SetIsUsed ())
                                throw new InvalidOperationException ("Cannot send the same request message multiple times");
 
-                       if (request.RequestUri == null) {
+                       var uri = request.RequestUri;
+                       if (uri == null) {
                                if (base_address == null)
                                        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) {
+                       } else if (!uri.IsAbsoluteUri || uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal)) {
                                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);
+                               request.RequestUri = new Uri (base_address, uri);
                        }
 
                        if (headers != null) {
@@ -303,14 +306,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);
                }