mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: eda34b08e5a62167257181b857f2e886403f86b2
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2017-05-11 09:47:48 +00:00
commit 72cc630544
16 changed files with 32 additions and 22 deletions

30
mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs

@ -161,18 +161,28 @@ namespace Mono.Net.Security
if (providerRegistration != null) if (providerRegistration != null)
return; return;
providerRegistration = new Dictionary<string,string> (); 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 ()) string legacyProvider = "Mono.Net.Security.LegacyTlsProvider";
providerRegistration.Add ("btls", "Mono.Btls.MonoBtlsProvider"); 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 (); X509Helper2.Initialize ();
} }
} }

2
mcs/class/lib/monolite/1050000000/System.dll.REMOVED.git-id

@ -1 +1 @@
066bc9062048be6b18ca61602d127caa45a9e448 215823960c76ebda8def72ae00467821f3710a94

2
mono/mini/Makefile.am

@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile 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 # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

2
mono/mini/Makefile.am.in

@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile 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 # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

2
mono/mini/Makefile.in.REMOVED.git-id

@ -1 +1 @@
c56a1bc4df9e6127aab55d56ef2a1e6f03caccc9 66f0ba10fffc18d1a1795891c93bd0215029648d

2
mono/mini/version.h

@ -1 +1 @@
#define FULL_VERSION "Stable 5.0.0.94/1d0445b" #define FULL_VERSION "Stable 5.0.0.100/9667aa6"

4
mono/sgen/sgen-alloc.c

@ -240,7 +240,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
p = (void **)sgen_nursery_alloc (size); p = (void **)sgen_nursery_alloc (size);
} }
if (!p) if (!p)
return alloc_degraded (vtable, size, FALSE); return alloc_degraded (vtable, size, TRUE);
zero_tlab_if_necessary (p, size); zero_tlab_if_necessary (p, size);
} else { } 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); p = (void **)sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
} }
if (!p) if (!p)
return alloc_degraded (vtable, size, FALSE); return alloc_degraded (vtable, size, TRUE);
/* Allocate a new TLAB from the current nursery fragment */ /* Allocate a new TLAB from the current nursery fragment */
TLAB_START = (char*)p; TLAB_START = (char*)p;

BIN
po/mcs/de.gmo

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id

@ -1 +1 @@
fe984f75d8f3e8554069906e2f9ed049b94107f2 3089bb97fe1d4a69f524f176791f1b6ee6cf2019

BIN
po/mcs/es.gmo

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id

@ -1 +1 @@
5be88f319e820f726cfdfb5bb4ec2d9b7de97482 15401895df38271eec5257a5fb249eac88abc566

BIN
po/mcs/ja.gmo

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id

@ -1 +1 @@
a659efad418c9664b8ee5d9b91f7903fc54fd732 3b15d5428b6e609836cff776dcf081b9b3ff27e4

2
po/mcs/mcs.pot

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.0.0\n" "Project-Id-Version: mono 5.0.0\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id

@ -1 +1 @@
f08602364bd40e296101f38b07540e1c9b41c7a2 bc28821a824c253df2dcde1420bd66daee30b49a