Merge branch 'upstream'
Former-commit-id: 488921a1597d1c466f9eeea8d135d20995363456
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
b2c2605d57
@ -1 +1 @@
|
||||
5abf189e54335ac27c79ccacb2b531e11e5d47b4
|
||||
ad5c394c5eaa6733f3dfbdb3f444a98a4952d109
|
||||
@ -1 +1 @@
|
||||
1b17b4391b9c108405382d26281745883c0aab41
|
||||
07de5a7327b030685cf322da0ea00819caf97b99
|
||||
@ -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";
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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 ();
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
281f4ff84d2fc400f6114acdba054d724722338e
|
||||
3415b4700e5e7f96b90170d92495cca6cbd1427d
|
||||
@ -1 +1 @@
|
||||
80ecae210739888e670c2cac82576c13e2a76fe1
|
||||
d771de342ef8174e767368ae53cb13435d62f751
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
f873a8238fb04ff8f987393aed131c18983f3379
|
||||
d3c03f4245b44d43dec965911e029c83ff5ec21f
|
||||
@ -1 +1 @@
|
||||
f87983e04ab5c6c733146c664bccaed3f2e48541
|
||||
ec5c16e7fa46086d165ca589a888afb621cf27a0
|
||||
@ -1 +1 @@
|
||||
41598302670ed4a99808c4c195939cd237d5c0cc
|
||||
ba352fa31af7edf32625787dfc25b41eb0a363b0
|
||||
@ -1 +1 @@
|
||||
ee989464bba21bcece33919ef912d836328b37d5
|
||||
210d0a1bf843db79fb9e32d97345686d52789b15
|
||||
@ -1 +1 @@
|
||||
624c13b19fcf97b1b09527edf61c8cc010716fb7
|
||||
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
|
||||
@ -1 +1 @@
|
||||
227891804d7ff257fdd1483191b4071ad9f25997
|
||||
e260715ef65ab4c6fb25b255262b4a8410b085f4
|
||||
@ -1 +1 @@
|
||||
281f4ff84d2fc400f6114acdba054d724722338e
|
||||
3415b4700e5e7f96b90170d92495cca6cbd1427d
|
||||
@ -1 +1 @@
|
||||
80ecae210739888e670c2cac82576c13e2a76fe1
|
||||
d771de342ef8174e767368ae53cb13435d62f751
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
f873a8238fb04ff8f987393aed131c18983f3379
|
||||
d3c03f4245b44d43dec965911e029c83ff5ec21f
|
||||
@ -1 +1 @@
|
||||
f87983e04ab5c6c733146c664bccaed3f2e48541
|
||||
ec5c16e7fa46086d165ca589a888afb621cf27a0
|
||||
@ -1 +1 @@
|
||||
41598302670ed4a99808c4c195939cd237d5c0cc
|
||||
ba352fa31af7edf32625787dfc25b41eb0a363b0
|
||||
@ -1 +1 @@
|
||||
ee989464bba21bcece33919ef912d836328b37d5
|
||||
210d0a1bf843db79fb9e32d97345686d52789b15
|
||||
@ -1 +1 @@
|
||||
624c13b19fcf97b1b09527edf61c8cc010716fb7
|
||||
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
|
||||
@ -1 +1 @@
|
||||
227891804d7ff257fdd1483191b4071ad9f25997
|
||||
e260715ef65ab4c6fb25b255262b4a8410b085f4
|
||||
@ -1 +1 @@
|
||||
281f4ff84d2fc400f6114acdba054d724722338e
|
||||
3415b4700e5e7f96b90170d92495cca6cbd1427d
|
||||
@ -1 +1 @@
|
||||
80ecae210739888e670c2cac82576c13e2a76fe1
|
||||
d771de342ef8174e767368ae53cb13435d62f751
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
f873a8238fb04ff8f987393aed131c18983f3379
|
||||
d3c03f4245b44d43dec965911e029c83ff5ec21f
|
||||
@ -1 +1 @@
|
||||
f87983e04ab5c6c733146c664bccaed3f2e48541
|
||||
ec5c16e7fa46086d165ca589a888afb621cf27a0
|
||||
@ -1 +1 @@
|
||||
41598302670ed4a99808c4c195939cd237d5c0cc
|
||||
ba352fa31af7edf32625787dfc25b41eb0a363b0
|
||||
@ -1 +1 @@
|
||||
ee989464bba21bcece33919ef912d836328b37d5
|
||||
210d0a1bf843db79fb9e32d97345686d52789b15
|
||||
@ -1 +1 @@
|
||||
624c13b19fcf97b1b09527edf61c8cc010716fb7
|
||||
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
|
||||
@ -1 +1 @@
|
||||
227891804d7ff257fdd1483191b4071ad9f25997
|
||||
e260715ef65ab4c6fb25b255262b4a8410b085f4
|
||||
@ -726,9 +726,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg)
|
||||
MONO_INST_NEW ((cfg), (inst), (OP_LCOMPARE_IMM)); \
|
||||
inst->sreg1 = sr1; \
|
||||
if (SIZEOF_REGISTER == 4 && COMPILE_LLVM (cfg)) { \
|
||||
guint64 _l = (imm); \
|
||||
inst->inst_imm = _l & 0xffffffff; \
|
||||
inst->inst_offset = _l >> 32; \
|
||||
inst->inst_l = (imm); \
|
||||
} else { \
|
||||
inst->inst_imm = (imm); \
|
||||
} \
|
||||
|
||||
@ -672,6 +672,9 @@ mono_local_cprop (MonoCompile *cfg)
|
||||
if ((def->opcode == OP_I8CONST) && (sizeof (gpointer) == 4)) {
|
||||
ins->inst_ls_word = def->inst_ls_word;
|
||||
ins->inst_ms_word = def->inst_ms_word;
|
||||
} else if (regtype == 'l' && sizeof (gpointer) == 4) {
|
||||
/* This can happen if the def was a result of an iconst+conv.i8, which is transformed into just an iconst */
|
||||
ins->inst_l = def->inst_c0;
|
||||
} else {
|
||||
ins->inst_imm = def->inst_c0;
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
40ef50b2c0ba1ddad1dce319ec42832e03b82600
|
||||
a984905c86090377b0630031ad2e25a436d6b861
|
||||
@ -1 +1 @@
|
||||
6cde57fb2e9576dae47af23141d74131d94ebf9e
|
||||
82c015035f331d30e7c5f01bf4eebe843b1479e0
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/ca79abc"
|
||||
#define FULL_VERSION "explicit/43e7e83"
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
26f20bbd206b146eef89b7e5b7b356509ff275b3
|
||||
7e5f7d41a7c415141cd3d6f620757af399431574
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1e4afd8f8cae4cb2e25a3bc7b2da905c1fe29193
|
||||
67cf3696b5c2921e8e030d9cfde8aa56e9664a7c
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6b6e33f78ce9f29c2f9943220c744c0a1d403a55
|
||||
505c9f2c21b5fd776a637bde5e96fe5be5bfad0c
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.16.0.123\n"
|
||||
"Project-Id-Version: mono 5.16.0.127\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-08-29 08:08+0000\n"
|
||||
"POT-Creation-Date: 2018-08-30 08:06+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
e7ef7217204fc3a0e7ae00aa451eddbe37a62911
|
||||
aab884301f62f739647e4e92906a73c8c18661af
|
||||
Loading…
x
Reference in New Issue
Block a user