diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-29 16:11:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 16:11:43 -0400 |
| commit | 6121e67a0750d6a1883d32f08dfc74d7544689bb (patch) | |
| tree | 57e03f441504689245922934474d4eb016426d13 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | 93321730f4577d479c1c70b6c01c7aa2db79cb54 (diff) | |
| parent | 9f86ebab28207be22617e165214ba68c35a09b15 (diff) | |
Merge pull request #2925 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 699621043..57c509923 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1931,13 +1931,13 @@ namespace Emby.Server.Implementations { get { - return SupportsHttps && ServerConfigurationManager.Configuration.EnableHttps; + return SupportsHttps && (ServerConfigurationManager.Configuration.EnableHttps || ServerConfigurationManager.Configuration.RequireHttps); } } public bool SupportsHttps { - get { return Certificate != null; } + get { return Certificate != null || ServerConfigurationManager.Configuration.IsBehindProxy; } } public async Task<string> GetLocalApiUrl() |