Merge branch 'upstream'

Former-commit-id: 0c0a4a4ca63448c3c7ae95c0ac6a25c9144dd8c7
2018-09-01 08:27:18 +00:00 · 2018-09-01 08:27:18 +00:00 · d3f15cd814
commit d3f15cd814
parent e4d2757cbc 526ff2cf78
61 changed files with 88 additions and 68 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-ad5c394c5eaa6733f3dfbdb3f444a98a4952d109
+4d4ef565049e2cd1fa0bf44be14ae23d425026b8
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-07de5a7327b030685cf322da0ea00819caf97b99
+9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.16.0.127";
+	public const string MonoVersion = "5.16.0.135";
 	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/Mono.Net.Security/MobileAuthenticatedStream.cs
+++ b/mcs/class/System/Mono.Net.Security/MobileAuthenticatedStream.cs
@ -77,7 +77,7 @@ namespace Mono.Net.Security
 			Settings = settings;
 			Provider = provider;

-			readBuffer = new BufferOffsetSize2 (16384);
+			readBuffer = new BufferOffsetSize2 (16834);
 			writeBuffer = new BufferOffsetSize2 (16384);
 			operation = Operation.None;
 		}
--- a/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
@ -50,7 +50,7 @@ using System.Security.Cryptography;

 namespace Mono.Net.Security
 {
-	class MonoTlsStream : IDisposable
+	class MonoTlsStream
 	{
 #if SECURITY_DEP
 		readonly MonoTlsProvider provider;
@ -136,7 +136,6 @@ namespace Mono.Net.Security
 					request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
 				else {
 					request.ServicePoint.UpdateClientCertificate (null);
-					sslStream.Dispose ();
 					sslStream = null;
 				}
 			}
@ -155,13 +154,5 @@ namespace Mono.Net.Security
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 #endif
 		}
-
-		public void Dispose ()
-		{
-			if (sslStream != null) {
-				sslStream.Dispose ();
-				sslStream = null;
-			}
-		}
 	}
 }
--- a/mcs/class/System/System.Net/WebConnection.cs
+++ b/mcs/class/System/System.Net/WebConnection.cs
@ -405,7 +405,6 @@ namespace System.Net
 		void CloseSocket ()
 		{
 			lock (this) {
-				Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}");
 				if (networkStream != null) {
 					try {
 						networkStream.Dispose ();
@ -413,13 +412,6 @@ namespace System.Net
 					networkStream = null;
 				}

-				if (monoTlsStream != null) {
-					try {
-						monoTlsStream.Dispose ();
-					} catch { }
-					monoTlsStream = null;
-				}
-
 				if (socket != null) {
 					try {
 						socket.Dispose ();
--- a/mcs/class/System/System.Net/WebReadStream.cs
+++ b/mcs/class/System/System.Net/WebReadStream.cs
@ -41,7 +41,7 @@ namespace System.Net
 		}

 #if MONO_WEB_DEBUG
-		internal string ME => $"WRS({GetType ().Name}:Op={Operation.ID})";
+		internal string ME => $"WRS({GetType ().Name}:Op={operation.ID})";
 #else
 		internal string ME => null;
 #endif
--- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-3415b4700e5e7f96b90170d92495cca6cbd1427d
+69bd0fc4c0542553b5fd030f3aa2be77d44b91a0
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d771de342ef8174e767368ae53cb13435d62f751
+41237ab35261a093d70cfb46a706988944a2fe91
--- a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-d3c03f4245b44d43dec965911e029c83ff5ec21f
+9dad5a97d4beb66ca299a769b1120d1a8e216baf
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-ec5c16e7fa46086d165ca589a888afb621cf27a0
+bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-ba352fa31af7edf32625787dfc25b41eb0a363b0
+6db7ca567c9f0072c556397c50da9169e5058892
--- a/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
@ -1 +1 @@
-210d0a1bf843db79fb9e32d97345686d52789b15
+ee989464bba21bcece33919ef912d836328b37d5
--- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-5d2fd270e40afe3fe9427a332c9b25fc1d10a049
+4b7b0a51812de6a0fb4f6476fa3464b18278f342
--- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-e260715ef65ab4c6fb25b255262b4a8410b085f4
+bf69562e337368809f7b67ed4f50b9ae2d18add3
--- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-3415b4700e5e7f96b90170d92495cca6cbd1427d
+69bd0fc4c0542553b5fd030f3aa2be77d44b91a0
--- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d771de342ef8174e767368ae53cb13435d62f751
+41237ab35261a093d70cfb46a706988944a2fe91
--- a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-d3c03f4245b44d43dec965911e029c83ff5ec21f
+9dad5a97d4beb66ca299a769b1120d1a8e216baf
--- a/Show More
+++ b/Show More