starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into simplify-https-config

Browse Source 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
This commit is contained in:
Mark Monteiro
2020-04-26 17:37:30 -04:00
parent cabdec87e8 241dea6706
commit 679f97d5e9
28 changed files with 136 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Jellyfin.Server/Program.cs
View File

@@ -262,9 +262,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);