diff --git a/external/corefx b/external/corefx index 33308c540f2a..ee3acec16b37 160000 --- a/external/corefx +++ b/external/corefx @@ -1 +1 @@ -Subproject commit 33308c540f2a06d11f555a80244728941f09f628 +Subproject commit ee3acec16b37bec5016da129e1e3840097ca629b diff --git a/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs b/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs index 87adab770f66..91f381915f1e 100644 --- a/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs +++ b/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs @@ -12,6 +12,10 @@ static bool IsAllowedAbsoluteUri (Uri uri) return true; #endif + // Mono URI handling which does not distinguish between file and url absolute paths without scheme + if (uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal)) + return true; + return HttpUtilities.IsHttpUri (uri); } } 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 7163231796cf..402be6aa876e 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs @@ -375,8 +375,7 @@ public void Send () Assert.AreEqual (response, client.SendAsync (request).Result, "#1"); } - [Test] - [Category ("NotWorking")] + [Test] public void Send_BaseAddress () { var mh = new HttpMessageHandlerMock ();