diff options
| author | Patrick Barron <18354464+barronpm@users.noreply.github.com> | 2020-05-13 19:06:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 19:06:04 +0000 |
| commit | a8f0d0aa0dfe589f4dd5148d0c328bf83271ffb2 (patch) | |
| tree | fb1d6d677e75aaa3abff0afb6f87d15982fe109f /Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | |
| parent | 511d20a100398baca38f24adfabc56f6f3cfac9c (diff) | |
| parent | f08830ea00e7111d68f12b001995edc56177f6e4 (diff) | |
Merge branch 'master' into activitydb-efcore
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/HttpListenerHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index 211a0c1d9..01813fac1 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -424,9 +424,13 @@ namespace Emby.Server.Implementations.HttpServer return true; } + /// <summary> + /// Validate a connection from a remote IP address to a URL to see if a redirection to HTTPS is required. + /// </summary> + /// <returns>True if the request is valid, or false if the request is not valid and an HTTPS redirect is required.</returns> private bool ValidateSsl(string remoteIp, string urlString) { - if (_config.Configuration.RequireHttps && _appHost.EnableHttps && !_config.Configuration.IsBehindProxy) + if (_config.Configuration.RequireHttps && _appHost.ListenWithHttps) { if (urlString.IndexOf("https://", StringComparison.OrdinalIgnoreCase) == -1) { |