Merge branch 'upstream'

Former-commit-id: 488921a1597d1c466f9eeea8d135d20995363456
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-08-30 08:26:57 +00:00
commit b2c2605d57
48 changed files with 60 additions and 42 deletions

View File

@ -1 +1 @@
5abf189e54335ac27c79ccacb2b531e11e5d47b4
ad5c394c5eaa6733f3dfbdb3f444a98a4952d109

View File

@ -1 +1 @@
1b17b4391b9c108405382d26281745883c0aab41
07de5a7327b030685cf322da0ea00819caf97b99

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.16.0.123";
public const string MonoVersion = "5.16.0.127";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -77,7 +77,7 @@ namespace Mono.Net.Security
Settings = settings;
Provider = provider;
readBuffer = new BufferOffsetSize2 (16834);
readBuffer = new BufferOffsetSize2 (16384);
writeBuffer = new BufferOffsetSize2 (16384);
operation = Operation.None;
}

View File

@ -50,7 +50,7 @@ using System.Security.Cryptography;
namespace Mono.Net.Security
{
class MonoTlsStream
class MonoTlsStream : IDisposable
{
#if SECURITY_DEP
readonly MonoTlsProvider provider;
@ -136,6 +136,7 @@ namespace Mono.Net.Security
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
else {
request.ServicePoint.UpdateClientCertificate (null);
sslStream.Dispose ();
sslStream = null;
}
}
@ -154,5 +155,13 @@ namespace Mono.Net.Security
throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
#endif
}
public void Dispose ()
{
if (sslStream != null) {
sslStream.Dispose ();
sslStream = null;
}
}
}
}

View File

@ -405,6 +405,7 @@ namespace System.Net
void CloseSocket ()
{
lock (this) {
Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}");
if (networkStream != null) {
try {
networkStream.Dispose ();
@ -412,6 +413,13 @@ 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

View File

@ -1 +1 @@
281f4ff84d2fc400f6114acdba054d724722338e
3415b4700e5e7f96b90170d92495cca6cbd1427d

View File

@ -1 +1 @@
80ecae210739888e670c2cac82576c13e2a76fe1
d771de342ef8174e767368ae53cb13435d62f751

View File

@ -1 +1 @@
f873a8238fb04ff8f987393aed131c18983f3379
d3c03f4245b44d43dec965911e029c83ff5ec21f

View File

@ -1 +1 @@
f87983e04ab5c6c733146c664bccaed3f2e48541
ec5c16e7fa46086d165ca589a888afb621cf27a0

View File

@ -1 +1 @@
41598302670ed4a99808c4c195939cd237d5c0cc
ba352fa31af7edf32625787dfc25b41eb0a363b0

View File

@ -1 +1 @@
ee989464bba21bcece33919ef912d836328b37d5
210d0a1bf843db79fb9e32d97345686d52789b15

View File

@ -1 +1 @@
624c13b19fcf97b1b09527edf61c8cc010716fb7
5d2fd270e40afe3fe9427a332c9b25fc1d10a049

View File

@ -1 +1 @@
227891804d7ff257fdd1483191b4071ad9f25997
e260715ef65ab4c6fb25b255262b4a8410b085f4

View File

@ -1 +1 @@
281f4ff84d2fc400f6114acdba054d724722338e
3415b4700e5e7f96b90170d92495cca6cbd1427d

View File

@ -1 +1 @@
80ecae210739888e670c2cac82576c13e2a76fe1
d771de342ef8174e767368ae53cb13435d62f751

View File

@ -1 +1 @@
f873a8238fb04ff8f987393aed131c18983f3379
d3c03f4245b44d43dec965911e029c83ff5ec21f

Some files were not shown because too many files have changed in this diff Show More