diff options
| author | cvium <clausvium@gmail.com> | 2021-11-08 10:38:08 +0100 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-11-08 10:38:08 +0100 |
| commit | f03e77a4d5fa0ca81ecb11f0ffc4c14706a6dd7d (patch) | |
| tree | 06ae22d6e13ac26ab9dcb97e54591ad55654d3e1 /Jellyfin.Networking | |
| parent | 153e9202397f236a4a415bd033c3b398b6e6573c (diff) | |
| parent | 83859a1e6d96cbb60a3b43f7537c0ab0fbdff510 (diff) | |
Merge branch 'master' into TVFix
Diffstat (limited to 'Jellyfin.Networking')
| -rw-r--r-- | Jellyfin.Networking/Configuration/NetworkConfiguration.cs | 5 | ||||
| -rw-r--r-- | Jellyfin.Networking/Jellyfin.Networking.csproj | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs index faf814c06..61db223d9 100644 --- a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs +++ b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs @@ -226,5 +226,10 @@ namespace Jellyfin.Networking.Configuration /// Gets or sets the known proxies. If the proxy is a network, it's added to the KnownNetworks. /// </summary> public string[] KnownProxies { get; set; } = Array.Empty<string>(); + + /// <summary> + /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests. + /// </summary> + public bool EnablePublishedServerUriByRequest { get; set; } = false; } } diff --git a/Jellyfin.Networking/Jellyfin.Networking.csproj b/Jellyfin.Networking/Jellyfin.Networking.csproj index 227a41ce4..0cd9a5915 100644 --- a/Jellyfin.Networking/Jellyfin.Networking.csproj +++ b/Jellyfin.Networking/Jellyfin.Networking.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net5.0</TargetFramework> + <TargetFramework>net6.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateDocumentationFile>true</GenerateDocumentationFile> </PropertyGroup> |