alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-26 10:36:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps

Browse Source
This commit is contained in:
Mark Monteiro
2020-04-02 17:45:04 -04:00
parent 5a816f0b22
commit ca71ac72ab
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -1408,7 +1408,7 @@ namespace Emby.Server.Implementations
InternalMetadataPath = ApplicationPaths.InternalMetadataPath,
CachePath = ApplicationPaths.CachePath,
HttpServerPortNumber = HttpPort,
SupportsHttps = SupportsHttps,
SupportsHttps = CanConnectWithHttps,
HttpsPortNumber = HttpsPort,
OperatingSystem = OperatingSystem.Id.ToString(),
OperatingSystemDisplayName = OperatingSystem.Name,
@@ -1446,9 +1446,14 @@ namespace Emby.Server.Implementations
};
}
public bool EnableHttps => SupportsHttps && ServerConfigurationManager.Configuration.EnableHttps;
/// <inheritdoc/>
public bool ListenWithHttps => Certificate != null && ServerConfigurationManager.Configuration.EnableHttps;
public bool SupportsHttps => Certificate != null || ServerConfigurationManager.Configuration.IsBehindProxy;
/// <summary>
/// Gets a value indicating whether a client can connect to the server over HTTPS, either directly or via a
/// reverse proxy.
/// </summary>
public bool CanConnectWithHttps => ListenWithHttps || ServerConfigurationManager.Configuration.IsBehindProxy;
public async Task<string> GetLocalApiUrl(CancellationToken cancellationToken)
{
@@ -1509,10 +1514,10 @@ namespace Emby.Server.Implementations
public string GetLocalApiUrl(ReadOnlySpan<char> host)
{
var url = new StringBuilder(64);
url.Append(EnableHttps ? "https://" : "http://")
url.Append(ListenWithHttps ? "https://" : "http://")
.Append(host)
.Append(':')
.Append(EnableHttps ? HttpsPort : HttpPort);
.Append(ListenWithHttps ? HttpsPort : HttpPort);
string baseUrl = ServerConfigurationManager.Configuration.BaseUrl;
if (baseUrl.Length != 0)