diff options
| author | crobibero <cody@robibe.ro> | 2020-08-03 11:24:13 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-03 11:24:13 -0600 |
| commit | f915c3e5d9af689a3ffe045c5d495900e562080b (patch) | |
| tree | dee25d7d92f0f56d12e661261ac382b48f08772b /Emby.Server.Implementations/Networking/NetworkManager.cs | |
| parent | 6a42a48c09b8125e96daa057f755bc67ce7bac37 (diff) | |
| parent | 5b4863c65b777d178f6573a8a584e2e9bac0d156 (diff) | |
Merge remote-tracking branch 'upstream/master' into api-migration
Diffstat (limited to 'Emby.Server.Implementations/Networking/NetworkManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Networking/NetworkManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs index 50cb44b28..089ec30e6 100644 --- a/Emby.Server.Implementations/Networking/NetworkManager.cs +++ b/Emby.Server.Implementations/Networking/NetworkManager.cs @@ -165,7 +165,7 @@ namespace Emby.Server.Implementations.Networking (octet[0] == 127) || // RFC1122 (octet[0] == 169 && octet[1] == 254)) // RFC3927 { - return false; + return true; } if (checkSubnets && IsInPrivateAddressSpaceAndLocalSubnet(endpoint)) @@ -390,7 +390,7 @@ namespace Emby.Server.Implementations.Networking var host = uri.DnsSafeHost; _logger.LogDebug("Resolving host {0}", host); - address = GetIpAddresses(host).Result.FirstOrDefault(); + address = GetIpAddresses(host).GetAwaiter().GetResult().FirstOrDefault(); if (address != null) { |