Imported Upstream version 6.4.0.173

Former-commit-id: 1fca76369cd4eee853c2b08d929399851f84c879
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-21 08:39:26 +00:00
parent 9763768dbe
commit 94da8f9655
53 changed files with 65 additions and 68 deletions

View File

@ -1 +1 @@
bcffcf6b4c5309d813b4b46871ba956735c27879
8cf7645085ab82d8e3b442d55bbf12055cd9fdeb

View File

@ -1 +1 @@
1cef2f5fb1ed63b6ab6623490aeae8d2afeffe53
cd7b168922c0782c22d787e2bf5702763e633d1e

View File

@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
Package.__init__(self, 'gtk-sharp',
sources=['git://github.com/mono/gtk-sharp.git'],
git_branch='gtk-sharp-2-12-branch',
revision='2e6bab50c5873674fa7da3102c36f182aa0baf34',
revision='6a98cdb3414a760d44eee5bd4b17224a6762d7ad',
override_properties={
'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
}

View File

@ -56,11 +56,11 @@ namespace System.IO.Tests
[PlatformSpecific(TestPlatforms.AnyUnix)]
public void DanglingSymlinkCopy()
{
string dangling_symlink = GetTestFileName();
string missing_target = GetTestFileName();
string dangling_symlink_new_location = GetTestFileName();
string dangling_symlink = GetTestFilePath();
string missing_target = GetTestFilePath();
string dangling_symlink_new_location = GetTestFilePath();
Assert.False(File.Exists(missing_target));
Assert.Equal(symlink(missing_target, dangling_symlink), 0);
Assert.Equal(0, symlink(missing_target, dangling_symlink));
Copy(dangling_symlink, dangling_symlink_new_location);
Assert.True(File.Exists(dangling_symlink_new_location)); // File.Exists returns true for dangling symlinks
}

View File

@ -182,11 +182,11 @@ namespace System.IO.Tests
[PlatformSpecific(TestPlatforms.AnyUnix)]
public void DanglingSymlinkMove()
{
string dangling_symlink = GetTestFileName();
string missing_target = GetTestFileName();
string dangling_symlink_new_location = GetTestFileName();
string dangling_symlink = GetTestFilePath();
string missing_target = GetTestFilePath();
string dangling_symlink_new_location = GetTestFilePath();
Assert.False(File.Exists(missing_target));
Assert.Equal(symlink(missing_target, dangling_symlink), 0);
Assert.Equal(0, symlink(missing_target, dangling_symlink));
Move(dangling_symlink, dangling_symlink_new_location);
Assert.True(File.Exists(dangling_symlink_new_location)); // File.Exists returns true for dangling symlinks
}

View File

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

@ -120,25 +120,21 @@ namespace Mono.Net.Security
ServicePointManager.CheckCertificateRevocationList).ConfigureAwait (false);
status = WebExceptionStatus.Success;
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
} catch (Exception ex) {
WebConnection.Debug ($"MONO TLS STREAM ERROR: {socket.ID} {socket.CleanedUp} {ex.Message}");
if (socket.CleanedUp)
status = WebExceptionStatus.RequestCanceled;
else if (CertificateValidationFailed)
status = WebExceptionStatus.TrustFailure;
else
status = WebExceptionStatus.SecureChannelFailure;
throw;
} finally {
WebConnection.Debug ($"MONO TLS STREAM CREATE STREAM DONE: {socket.ID} {socket.CleanedUp}");
if (CertificateValidationFailed)
status = WebExceptionStatus.TrustFailure;
if (status == WebExceptionStatus.Success)
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
else {
request.ServicePoint.UpdateClientCertificate (null);
sslStream.Dispose ();
sslStream = null;
}
throw;
}
try {
@ -146,6 +142,7 @@ namespace Mono.Net.Security
await sslStream.WriteAsync (tunnel.Data, 0, tunnel.Data.Length, cancellationToken).ConfigureAwait (false);
} catch {
status = WebExceptionStatus.SendFailure;
sslStream.Dispose ();
sslStream = null;
throw;
}

View File

@ -1 +1 @@
69db36141ee7598d392ce104784ac4436739b72f
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714

View File

@ -1 +1 @@
ab01f899865bde8b626e9f2b8a1a27d716e5d673
0f5c025ed127058a98d60912766ed6065af338a5

View File

@ -1 +1 @@
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
1c31b4fe450fae5b1efd90500d11048787540885

View File

@ -1 +1 @@
3b79f4a1b828157eb520b1dab3775f83638aea7a
d352c15274b2f932fe586f0467d0c135b87cd593

View File

@ -1 +1 @@
95d9adff629742018c7f612156b0388f7e5927b3
6516a842c6ea697f5ce485e6c4780fff411505d7

View File

@ -1 +1 @@
9d4653def9f72effb65325d25cdf475fac1bcaa7
511bfbaa05e9e44a924a2880f881f0a03abcc22a

View File

@ -1 +1 @@
0224456dda5264f488172eab6c1b36f09e0b7df8
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f

View File

@ -1 +1 @@
374d292eeecf1f65a8e4565a3ac9202f58c03c23
a27e5a6d6f249f07571d837cb8ff6789a02bb884

View File

@ -1 +1 @@
69db36141ee7598d392ce104784ac4436739b72f
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714

View File

@ -1 +1 @@
ab01f899865bde8b626e9f2b8a1a27d716e5d673
0f5c025ed127058a98d60912766ed6065af338a5

View File

@ -1 +1 @@
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
1c31b4fe450fae5b1efd90500d11048787540885

View File

@ -1 +1 @@
3b79f4a1b828157eb520b1dab3775f83638aea7a
d352c15274b2f932fe586f0467d0c135b87cd593

View File

@ -1 +1 @@
95d9adff629742018c7f612156b0388f7e5927b3
6516a842c6ea697f5ce485e6c4780fff411505d7

View File

@ -1 +1 @@
9d4653def9f72effb65325d25cdf475fac1bcaa7
511bfbaa05e9e44a924a2880f881f0a03abcc22a

View File

@ -1 +1 @@
0224456dda5264f488172eab6c1b36f09e0b7df8
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f

View File

@ -1 +1 @@
c487126a2703279c4b6914c879564e280611876b
c1906e782f1aa7b8047ab024f22b8c3aef09eb28

View File

@ -1 +1 @@
374d292eeecf1f65a8e4565a3ac9202f58c03c23
a27e5a6d6f249f07571d837cb8ff6789a02bb884

View File

@ -1 +1 @@
69db36141ee7598d392ce104784ac4436739b72f
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714

View File

@ -1 +1 @@
ab01f899865bde8b626e9f2b8a1a27d716e5d673
0f5c025ed127058a98d60912766ed6065af338a5

View File

@ -1 +1 @@
5c8dcfa618d5dd948cc81e32dac43d7134ab0a0d
1c31b4fe450fae5b1efd90500d11048787540885

View File

@ -1 +1 @@
3b79f4a1b828157eb520b1dab3775f83638aea7a
d352c15274b2f932fe586f0467d0c135b87cd593

View File

@ -1 +1 @@
95d9adff629742018c7f612156b0388f7e5927b3
6516a842c6ea697f5ce485e6c4780fff411505d7

View File

@ -1 +1 @@
9d4653def9f72effb65325d25cdf475fac1bcaa7
511bfbaa05e9e44a924a2880f881f0a03abcc22a

View File

@ -1 +1 @@
0224456dda5264f488172eab6c1b36f09e0b7df8
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f

View File

@ -1 +1 @@
c487126a2703279c4b6914c879564e280611876b
c1906e782f1aa7b8047ab024f22b8c3aef09eb28

View File

@ -1 +1 @@
374d292eeecf1f65a8e4565a3ac9202f58c03c23
a27e5a6d6f249f07571d837cb8ff6789a02bb884

View File

@ -1 +1 @@
69db36141ee7598d392ce104784ac4436739b72f
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714

View File

@ -1 +1 @@
ab01f899865bde8b626e9f2b8a1a27d716e5d673
0f5c025ed127058a98d60912766ed6065af338a5

View File

@ -1 +1 @@
5fa3256cb9bd642221e9c59c6fd58e5b88ffd7bb
07f4a578c468141998662bb6012cfeb47b61949f

View File

@ -1 +1 @@
3b79f4a1b828157eb520b1dab3775f83638aea7a
d352c15274b2f932fe586f0467d0c135b87cd593

View File

@ -1 +1 @@
95d9adff629742018c7f612156b0388f7e5927b3
6516a842c6ea697f5ce485e6c4780fff411505d7

View File

@ -1 +1 @@
9d4653def9f72effb65325d25cdf475fac1bcaa7
511bfbaa05e9e44a924a2880f881f0a03abcc22a

View File

@ -1 +1 @@
0224456dda5264f488172eab6c1b36f09e0b7df8
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f

View File

@ -1 +1 @@
c487126a2703279c4b6914c879564e280611876b
c1906e782f1aa7b8047ab024f22b8c3aef09eb28

View File

@ -1 +1 @@
32f849fcf8fcfc98a6b909c9891210bfdbe45ec0
6a5f983aba6497d36727d8a3dec8846063df0ea4

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/e6d44f7"
#define FULL_VERSION "explicit/cc0632e"

View File

@ -1491,10 +1491,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

Binary file not shown.

View File

@ -1 +1 @@
0b36fc25a69d0b43d973007f898ddf081fe9a38d
08494c360b8dfb72e3c4083caa712ce92a6a75bd

Binary file not shown.

View File

@ -1 +1 @@
f609f2875bfc5edaee627feeebc9085a65975e19
da9b91b3b0ae9725db077960502d523e09082328

Binary file not shown.

View File

@ -1 +1 @@
c780bf8a25d0cef6b6c189d7fc6af67f0cc673ca
4a9db897d633f54f57e5520261f75e8e4b1a22b0

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.4.0.170\n"
"Project-Id-Version: mono 6.4.0.173\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-08-17 08:10+0000\n"
"POT-Creation-Date: 2019-08-21 08:05+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"

Binary file not shown.

View File

@ -1 +1 @@
57902ef092fe73be748bea8677d22d78f36cd3dc
a22b26bd9a21d03a0193f7919b315f90afd7c30b