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

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 fc17d4cc95b464a717861d416a4595340e790892..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
@@ -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) {

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
index 36d54a6845b563a5f6734f57a313ae5f1f631eb4..b58318819a2de3bbbb1e36e633a2a24e1d340561 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
@@ -330,6 +330,7 @@ namespace MonoTests.System.Net.Http
                        };
 
                        Assert.AreEqual (response, client.GetAsync ("relative").Result, "#1");
+                       Assert.AreEqual (response, client.GetAsync ("/relative").Result, "#2");
                }
 
                [Test]