Merge remote-tracking branch 'upstream/master' into integration-tests

This commit is contained in:
Mark Monteiro
2020-05-03 01:04:19 -04:00
292 changed files with 12150 additions and 2790 deletions

View File

@@ -284,9 +284,15 @@ namespace Jellyfin.Server
.LocalNetworkAddresses
.Select(appHost.NormalizeConfiguredLocalAddress)
.Where(i => i != null)
.ToList();
if (addresses.Any())
.ToHashSet();
if (addresses.Any() && !addresses.Contains(IPAddress.Any))
{
if (!addresses.Contains(IPAddress.Loopback))
{
// we must listen on loopback for LiveTV to function regardless of the settings
addresses.Add(IPAddress.Loopback);
}
foreach (var address in addresses)
{
_logger.LogInformation("Kestrel listening on {IpAddress}", address);