Imported Upstream version 5.16.0.135
Former-commit-id: 28d9e60fa3ef68cbdb55d4aeeb9e18679dc66b69
This commit is contained in:
parent
29319da080
commit
526ff2cf78
@ -1 +1 @@
|
|||||||
ad5c394c5eaa6733f3dfbdb3f444a98a4952d109
|
4d4ef565049e2cd1fa0bf44be14ae23d425026b8
|
@ -1 +1 @@
|
|||||||
07de5a7327b030685cf322da0ea00819caf97b99
|
9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// 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 MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -77,7 +77,7 @@ namespace Mono.Net.Security
|
|||||||
Settings = settings;
|
Settings = settings;
|
||||||
Provider = provider;
|
Provider = provider;
|
||||||
|
|
||||||
readBuffer = new BufferOffsetSize2 (16384);
|
readBuffer = new BufferOffsetSize2 (16834);
|
||||||
writeBuffer = new BufferOffsetSize2 (16384);
|
writeBuffer = new BufferOffsetSize2 (16384);
|
||||||
operation = Operation.None;
|
operation = Operation.None;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ using System.Security.Cryptography;
|
|||||||
|
|
||||||
namespace Mono.Net.Security
|
namespace Mono.Net.Security
|
||||||
{
|
{
|
||||||
class MonoTlsStream : IDisposable
|
class MonoTlsStream
|
||||||
{
|
{
|
||||||
#if SECURITY_DEP
|
#if SECURITY_DEP
|
||||||
readonly MonoTlsProvider provider;
|
readonly MonoTlsProvider provider;
|
||||||
@ -136,7 +136,6 @@ namespace Mono.Net.Security
|
|||||||
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
|
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
|
||||||
else {
|
else {
|
||||||
request.ServicePoint.UpdateClientCertificate (null);
|
request.ServicePoint.UpdateClientCertificate (null);
|
||||||
sslStream.Dispose ();
|
|
||||||
sslStream = null;
|
sslStream = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -155,13 +154,5 @@ namespace Mono.Net.Security
|
|||||||
throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
|
throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose ()
|
|
||||||
{
|
|
||||||
if (sslStream != null) {
|
|
||||||
sslStream.Dispose ();
|
|
||||||
sslStream = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -405,7 +405,6 @@ namespace System.Net
|
|||||||
void CloseSocket ()
|
void CloseSocket ()
|
||||||
{
|
{
|
||||||
lock (this) {
|
lock (this) {
|
||||||
Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}");
|
|
||||||
if (networkStream != null) {
|
if (networkStream != null) {
|
||||||
try {
|
try {
|
||||||
networkStream.Dispose ();
|
networkStream.Dispose ();
|
||||||
@ -413,13 +412,6 @@ namespace System.Net
|
|||||||
networkStream = null;
|
networkStream = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (monoTlsStream != null) {
|
|
||||||
try {
|
|
||||||
monoTlsStream.Dispose ();
|
|
||||||
} catch { }
|
|
||||||
monoTlsStream = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (socket != null) {
|
if (socket != null) {
|
||||||
try {
|
try {
|
||||||
socket.Dispose ();
|
socket.Dispose ();
|
||||||
|
@ -41,7 +41,7 @@ namespace System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if MONO_WEB_DEBUG
|
#if MONO_WEB_DEBUG
|
||||||
internal string ME => $"WRS({GetType ().Name}:Op={Operation.ID})";
|
internal string ME => $"WRS({GetType ().Name}:Op={operation.ID})";
|
||||||
#else
|
#else
|
||||||
internal string ME => null;
|
internal string ME => null;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1 +1 @@
|
|||||||
3415b4700e5e7f96b90170d92495cca6cbd1427d
|
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0
|
@ -1 +1 @@
|
|||||||
d771de342ef8174e767368ae53cb13435d62f751
|
41237ab35261a093d70cfb46a706988944a2fe91
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
d3c03f4245b44d43dec965911e029c83ff5ec21f
|
9dad5a97d4beb66ca299a769b1120d1a8e216baf
|
@ -1 +1 @@
|
|||||||
ec5c16e7fa46086d165ca589a888afb621cf27a0
|
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647
|
@ -1 +1 @@
|
|||||||
ba352fa31af7edf32625787dfc25b41eb0a363b0
|
6db7ca567c9f0072c556397c50da9169e5058892
|
@ -1 +1 @@
|
|||||||
210d0a1bf843db79fb9e32d97345686d52789b15
|
ee989464bba21bcece33919ef912d836328b37d5
|
@ -1 +1 @@
|
|||||||
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
|
4b7b0a51812de6a0fb4f6476fa3464b18278f342
|
@ -1 +1 @@
|
|||||||
e260715ef65ab4c6fb25b255262b4a8410b085f4
|
bf69562e337368809f7b67ed4f50b9ae2d18add3
|
@ -1 +1 @@
|
|||||||
3415b4700e5e7f96b90170d92495cca6cbd1427d
|
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0
|
@ -1 +1 @@
|
|||||||
d771de342ef8174e767368ae53cb13435d62f751
|
41237ab35261a093d70cfb46a706988944a2fe91
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
d3c03f4245b44d43dec965911e029c83ff5ec21f
|
9dad5a97d4beb66ca299a769b1120d1a8e216baf
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user