Merge branch 'upstream'

Former-commit-id: 93c84fd5ae9287cc117ac0c91f6a6a72caf70313
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-11-02 08:29:09 +00:00
commit 139a73c0a7
50 changed files with 48 additions and 45 deletions

View File

@ -1 +1 @@
699cfd4c9b1bce8dffc3b7885c49e33ab58c6bd4
85f8eddb28634303dd6c3f91d53f2e1c3cb9fea0

View File

@ -1 +1 @@
46cd124686fe49a205eccc03cff361d68ed53609
c36924254401a4d926e1473e452fec74eb3b281c

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.190";
public const string MonoVersion = "5.18.0.191";
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

@ -75,6 +75,7 @@ namespace Mono
static int initialized;
static X509PalImpl x509pal;
static object syncRoot = new object ();
static void EnsureInitialized ()
{
@ -83,13 +84,15 @@ namespace Mono
* MonoTlsProviderFactory.InitializeInternal().
*
*/
if (Interlocked.CompareExchange (ref initialized, 1, 0) != 0)
return;
lock (syncRoot) {
if (Interlocked.CompareExchange (ref initialized, 1, 0) != 0)
return;
#if MONO_FEATURE_BTLS || MONO_FEATURE_APPLETLS
provider = MonoTlsProviderFactory.GetProvider ();
#endif
x509pal = GetX509Pal ();
x509pal = GetX509Pal ();
}
}
public X509PalImpl X509Pal {

View File

@ -1 +1 @@
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
4730c44f098a052d27632a5bfe2304ee4d3af913

View File

@ -1 +1 @@
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
10b482b579b3b06f78940ab3f5690d40ad6dd7f8

View File

@ -1 +1 @@
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
3b5c3c6a6fa41d6d2e8207e6deba4e15e54416e7

View File

@ -1 +1 @@
83960687818f20fb5ed018da0987e6c79a1dadda
a98b92266d1c0e161957995b6f2c254d175ff5d7

View File

@ -1 +1 @@
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
2ef73fd0e9d4df583428d687a2d980e16926f1dc

View File

@ -1 +1 @@
c569a83915eea42b3309739b9c6c3ad068c2f748
f2d0eb19c7e8ee9d66326772b513b293aa5b7b16

View File

@ -1 +1 @@
34423be78579b2ad73855ddda85fee17e27dff0a
4a3c4cffbd791d9c1a379923de144c08d79a0bdf

View File

@ -1 +1 @@
1183369df2ab1c52caf025f381f873d77262161f
b44dbf80dd8f12052dbc6683043e9777ad7847dd

View File

@ -1 +1 @@
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
4730c44f098a052d27632a5bfe2304ee4d3af913

View File

@ -1 +1 @@
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
10b482b579b3b06f78940ab3f5690d40ad6dd7f8

View File

@ -1 +1 @@
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
3b5c3c6a6fa41d6d2e8207e6deba4e15e54416e7

View File

@ -1 +1 @@
83960687818f20fb5ed018da0987e6c79a1dadda
a98b92266d1c0e161957995b6f2c254d175ff5d7

View File

@ -1 +1 @@
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
2ef73fd0e9d4df583428d687a2d980e16926f1dc

View File

@ -1 +1 @@
c569a83915eea42b3309739b9c6c3ad068c2f748
f2d0eb19c7e8ee9d66326772b513b293aa5b7b16

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