Imported Upstream version 6.4.0.183

Former-commit-id: 85d93be5537556349ef364365576dccf5d99b797
2019-08-28 08:43:56 +00:00
parent f94a1d9416
commit d213358eb3
49 changed files with 53 additions and 46 deletions
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "6.4.0.181";
+	public const string MonoVersion = "6.4.0.183";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs
+++ b/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs
@@ -12,6 +12,10 @@ namespace System.Net.Http
 				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);
 		}
 	}
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
@@ -374,8 +374,7 @@ namespace MonoTests.System.Net.Http
 			Assert.AreEqual (response, client.SendAsync (request).Result, "#1");
 		}

-		[Test]
-		[Category ("NotWorking")]
+		[Test]		
 		public void Send_BaseAddress ()
 		{
 			var mh = new HttpMessageHandlerMock ();
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-dfaa710d8cffa989eb11658766d4744ea5a6e602
+84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-01f8f6c6468af20d8c19ddeb64956ab06e7807fc
+af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-edfdea03528d626dc090d70ac981441a1854222d
+43d9590e4365814ccc62474eee87bc3c1878bb93
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-ca40e636a03390d303343a07feb3e07739b0482d
+402b55a12e64b2ce4670d243f09114f9c52ef06c
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-f8133a815d0ff5cc0c72c10e5ba6d97278601794
+dc9e0b9629e134ea423a418933f6c18238a213a7
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
+57293eefbd5a400e20b81deae90100ea5244c985
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-08b8eee766db7b49dcefb7d9d1662649d31654f4
+0746ab14270c79f16e1394e71ab25048001370be
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-dfaa710d8cffa989eb11658766d4744ea5a6e602
+84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-01f8f6c6468af20d8c19ddeb64956ab06e7807fc
+af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-edfdea03528d626dc090d70ac981441a1854222d
+43d9590e4365814ccc62474eee87bc3c1878bb93
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-ca40e636a03390d303343a07feb3e07739b0482d
+402b55a12e64b2ce4670d243f09114f9c52ef06c
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-f8133a815d0ff5cc0c72c10e5ba6d97278601794
+dc9e0b9629e134ea423a418933f6c18238a213a7
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
+57293eefbd5a400e20b81deae90100ea5244c985
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-70454f8b5a181f77a55c7e8be735ed2b06d930f2
+7da81eeed2ece50e3fd34954f3fb044896f74fa8
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-08b8eee766db7b49dcefb7d9d1662649d31654f4
+0746ab14270c79f16e1394e71ab25048001370be
--- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-dfaa710d8cffa989eb11658766d4744ea5a6e602
+84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
--- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-01f8f6c6468af20d8c19ddeb64956ab06e7807fc
+af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
--- a/Show More
+++ b/Show More