From 9cc54951a2903c5ebedb5f664291923306402cc2 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 11 May 2017 09:38:52 +0000 Subject: [PATCH] Imported Upstream version 5.0.0.100 Former-commit-id: b9c82b9a6f6d1841af7dcc458ddf5aefa1037f27 --- .../MonoTlsProviderFactory.cs | 30 ++++++++++++------ .../1050000000/System.dll.REMOVED.git-id | 2 +- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/sgen/sgen-alloc.c | 4 +-- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 16 files changed, 32 insertions(+), 22 deletions(-) diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs index 75138d8c71..2ddf74fa5d 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs +++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs @@ -161,18 +161,28 @@ namespace Mono.Net.Security if (providerRegistration != null) return; providerRegistration = new Dictionary (); - providerRegistration.Add ("legacy", "Mono.Net.Security.LegacyTlsProvider"); - - if (Platform.IsMacOS) - providerRegistration.Add ("default", "Mono.AppleTls.AppleTlsProvider"); - else - providerRegistration.Add ("default", "Mono.Net.Security.LegacyTlsProvider"); - if (IsBtlsSupported ()) - providerRegistration.Add ("btls", "Mono.Btls.MonoBtlsProvider"); + string legacyProvider = "Mono.Net.Security.LegacyTlsProvider"; + providerRegistration.Add ("legacy", legacyProvider); + + string defaultProvider = null; + if (IsBtlsSupported ()) { + var btlsProvider = "Mono.Btls.MonoBtlsProvider"; + providerRegistration.Add ("btls", btlsProvider); + defaultProvider = btlsProvider; + } - providerRegistration.Add ("apple", "Mono.AppleTls.AppleTlsProvider"); - + if (Platform.IsMacOS) { + var appleProvider = "Mono.AppleTls.AppleTlsProvider"; + providerRegistration.Add ("apple", appleProvider); + defaultProvider = appleProvider; + } + + if (defaultProvider == null) + defaultProvider = legacyProvider; + + providerRegistration.Add ("default", defaultProvider); + X509Helper2.Initialize (); } } diff --git a/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id index c2c7f721a9..7c390d0036 100644 --- a/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id @@ -1 +1 @@ -066bc9062048be6b18ca61602d127caa45a9e448 \ No newline at end of file +215823960c76ebda8def72ae00467821f3710a94 \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 6aea0961c1..927c30ba9f 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 5.0.0.94/1d0445b\"" > version.h + echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 6aea0961c1..927c30ba9f 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 5.0.0.94/1d0445b\"" > version.h + echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 319ebd9dc7..ee5e0eb4ba 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -c56a1bc4df9e6127aab55d56ef2a1e6f03caccc9 \ No newline at end of file +66f0ba10fffc18d1a1795891c93bd0215029648d \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 23f9f65c4a..b37749cfd2 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 5.0.0.94/1d0445b" +#define FULL_VERSION "Stable 5.0.0.100/9667aa6" diff --git a/mono/sgen/sgen-alloc.c b/mono/sgen/sgen-alloc.c index 3b167f8938..9a80575869 100644 --- a/mono/sgen/sgen-alloc.c +++ b/mono/sgen/sgen-alloc.c @@ -240,7 +240,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size) p = (void **)sgen_nursery_alloc (size); } if (!p) - return alloc_degraded (vtable, size, FALSE); + return alloc_degraded (vtable, size, TRUE); zero_tlab_if_necessary (p, size); } else { @@ -257,7 +257,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size) p = (void **)sgen_nursery_alloc_range (tlab_size, size, &alloc_size); } if (!p) - return alloc_degraded (vtable, size, FALSE); + return alloc_degraded (vtable, size, TRUE); /* Allocate a new TLAB from the current nursery fragment */ TLAB_START = (char*)p; diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index f7914927725a416d927cf003ecf8c5ee13a06345..aef425e11a98602a8192ac750c5bc890fbf65bd2 100644 GIT binary patch delta 21 ccmbQIHBW296D|%zLj?m%D`SJrZ@7%O08kMIqyPW_ delta 21 ccmbQIHBW296D|$|V+BJqD?`)GZ@7%O08kqSrT_o{ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 2e7c4d62c9..bf040d26b9 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -fe984f75d8f3e8554069906e2f9ed049b94107f2 \ No newline at end of file +3089bb97fe1d4a69f524f176791f1b6ee6cf2019 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 7042b130a044b513f63dd2a94f249a065cb293cc..190677f89ff77d75b07b017f451e7087a4c62e21 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et_p@M;>m9fEQQ^hHA09TO)+5i9m delta 21 ccmX?Ef3kjqt|Etlv4WwQm7(coQ^hHA09Ts^+yDRo diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 07a211d156..8fc49769eb 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -5be88f319e820f726cfdfb5bb4ec2d9b7de97482 \ No newline at end of file +15401895df38271eec5257a5fb249eac88abc566 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 24ebda931a64a30ffcd5a39cd3fb0398e75d2e88..fd025a3e8c0417aff8d6588e4bbd77625a7ad138 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19EOGp29{RF2AlcS3$y@dcLz2A delta 23 ecmeyri1Gg-#trQ190tY;hGtfVrknZI3$y@dfd@DM diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 5600fdc5af..5c9ecbf446 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -a659efad418c9664b8ee5d9b91f7903fc54fd732 \ No newline at end of file +3b15d5428b6e609836cff776dcf081b9b3ff27e4 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 9c378b5093..11650a8eae 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 5.0.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-05-03 16:15+0000\n" +"POT-Creation-Date: 2017-05-11 09:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index a30543c61a92e165496682e019b608ca1adb55e8..ca82cad439dca2a8b8a2ef7ab8c4e964a96d3fe6 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AI1CLH3@ojT4K^!IThR^xY~Bc& delta 23 fcmX@Po8{zgmJO2AI1G#x49%