[system.net.http] Add another workaround for incompatible mono Uri handling. Fixes...

[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..114e78e83c2a53037594ccfbdbc1e458879ea10e 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)
@@ -242,16 +242,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 +304,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);
                }