Imported Upstream version 5.16.0.135

Former-commit-id: 28d9e60fa3ef68cbdb55d4aeeb9e18679dc66b69
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-09-01 08:21:58 +00:00
parent 29319da080
commit 526ff2cf78
61 changed files with 88 additions and 68 deletions

View File

@@ -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;
}

View File

@@ -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;
}
}
}
}

View File

@@ -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 ();

View File

@@ -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