Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@ -1172,6 +1172,16 @@ namespace System.Net.Sockets
DnsEndPoint dep = e.RemoteEndPoint as DnsEndPoint;
if (dep != null) {
addresses = Dns.GetHostAddresses (dep.Host);
int last_valid = 0;
for (int i = 0; i < addresses.Length; ++i) {
if (addresses [i].AddressFamily != dep.AddressFamily)
continue;
addresses [last_valid++] = addresses [i];
}
if (last_valid != addresses.Length)
Array.Resize (ref addresses, last_valid);
return true;
} else {
e.ConnectByNameError = null;