aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
diff options
context:
space:
mode:
authorherby2212 <12448284+herby2212@users.noreply.github.com>2023-10-21 01:20:59 +0200
committerherby2212 <12448284+herby2212@users.noreply.github.com>2023-10-21 01:20:59 +0200
commit27ceee8b6c70570129b917d8467a3a5bb058eab4 (patch)
tree49309bf28c40f19a2cdc96a3ac051e88f30f14b1 /Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
parente8a05ad996ab35909cd5928d49c4e8c46e9985d5 (diff)
parentdf7032b09e720cf07169514433557edf22922d0c (diff)
update to current master to resolve merge conflict
Diffstat (limited to 'Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs')
-rw-r--r--Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 89dbbdd2f..cb1680558 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -282,7 +282,7 @@ namespace Jellyfin.Server.Extensions
AddIPAddress(config, options, subnet.Prefix, subnet.PrefixLength);
}
}
- else if (NetworkExtensions.TryParseHost(allowedProxies[i], out var addresses))
+ else if (NetworkExtensions.TryParseHost(allowedProxies[i], out var addresses, config.EnableIPv4, config.EnableIPv6))
{
foreach (var address in addresses)
{