Merge branch 'upstream'
Former-commit-id: eda34b08e5a62167257181b857f2e886403f86b2
This commit is contained in:
commit
72cc630544
@ -161,18 +161,28 @@ namespace Mono.Net.Security
|
||||
if (providerRegistration != null)
|
||||
return;
|
||||
providerRegistration = new Dictionary<string,string> ();
|
||||
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 ();
|
||||
}
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
066bc9062048be6b18ca61602d127caa45a9e448
|
||||
215823960c76ebda8def72ae00467821f3710a94
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -1 +1 @@
|
||||
c56a1bc4df9e6127aab55d56ef2a1e6f03caccc9
|
||||
66f0ba10fffc18d1a1795891c93bd0215029648d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "Stable 5.0.0.94/1d0445b"
|
||||
#define FULL_VERSION "Stable 5.0.0.100/9667aa6"
|
||||
|
@ -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;
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fe984f75d8f3e8554069906e2f9ed049b94107f2
|
||||
3089bb97fe1d4a69f524f176791f1b6ee6cf2019
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
5be88f319e820f726cfdfb5bb4ec2d9b7de97482
|
||||
15401895df38271eec5257a5fb249eac88abc566
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a659efad418c9664b8ee5d9b91f7903fc54fd732
|
||||
3b15d5428b6e609836cff776dcf081b9b3ff27e4
|
@ -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 <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 @@
|
||||
f08602364bd40e296101f38b07540e1c9b41c7a2
|
||||
bc28821a824c253df2dcde1420bd66daee30b49a
|
Loading…
x
Reference in New Issue
Block a user