Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -928,7 +928,11 @@ namespace System.Data.SqlClient
if (Client.Available <= 0)
return -1; // Error
IPEndPoint endpoint = new IPEndPoint (Dns.GetHostEntry ("localhost").AddressList [0], 0);
IPEndPoint endpoint = CreateLocalEndpoint ();
if (endpoint == null)
return -1;
Byte [] rawrs;
rawrs = Receive (ref endpoint);
@@ -953,6 +957,16 @@ namespace System.Data.SqlClient
return SqlServerTcpPort;
}
IPEndPoint CreateLocalEndpoint ()
{
foreach (var addr in Dns.GetHostEntry ("localhost").AddressList) {
if (addr.AddressFamily == Client.AddressFamily)
return new IPEndPoint (addr, 0);
}
return null;
}
}
struct ColumnInfo