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

@ -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;
}
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

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