diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index e3f8ec0146..dc542af784 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -420,6 +420,10 @@ namespace Emby.Server.Implementations.HttpServer
return true;
}
+ ///
+ /// Validate a connection from a remote IP address to a URL to see if a redirection to HTTPS is required.
+ ///
+ /// True if the request is valid, or false if the request is not valid and an HTTPS redirect is required.
private bool ValidateSsl(string remoteIp, string urlString)
{
if (_config.Configuration.RequireHttps && _appHost.ListenWithHttps)
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 3107ec2426..b14b347ccc 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -45,17 +45,24 @@ namespace MediaBrowser.Model.Configuration
public int HttpsPortNumber { get; set; }
///
- /// Gets or sets a value indicating whether [use HTTPS].
+ /// Gets or sets a value indicating whether to use HTTPS.
///
- /// true if [use HTTPS]; otherwise, false.
+ ///
+ /// In order for HTTPS to be used, in addition to setting this to true, valid values must also be
+ /// provided for and .
+ ///
public bool EnableHttps { get; set; }
+
public bool EnableNormalizedItemByNameIds { get; set; }
///
- /// Gets or sets the value pointing to the file system where the ssl certificate is located..
+ /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
///
- /// The value pointing to the file system where the ssl certificate is located..
public string CertificatePath { get; set; }
+
+ ///
+ /// Gets or sets the password required to access the X.509 certificate data in the file specified by .
+ ///
public string CertificatePassword { get; set; }
///
@@ -65,8 +72,11 @@ namespace MediaBrowser.Model.Configuration
public bool IsPortAuthorized { get; set; }
public bool AutoRunWebApp { get; set; }
+
public bool EnableRemoteAccess { get; set; }
+
public bool CameraUploadUpgraded { get; set; }
+
public bool CollectionsUpgraded { get; set; }
///
@@ -82,6 +92,7 @@ namespace MediaBrowser.Model.Configuration
///
/// The metadata path.
public string MetadataPath { get; set; }
+
public string MetadataNetworkPath { get; set; }
///
@@ -204,15 +215,31 @@ namespace MediaBrowser.Model.Configuration
public int RemoteClientBitrateLimit { get; set; }
public bool EnableFolderView { get; set; }
+
public bool EnableGroupingIntoCollections { get; set; }
+
public bool DisplaySpecialsWithinSeasons { get; set; }
+
public string[] LocalNetworkSubnets { get; set; }
+
public string[] LocalNetworkAddresses { get; set; }
+
public string[] CodecsUsed { get; set; }
+
public bool IgnoreVirtualInterfaces { get; set; }
+
public bool EnableExternalContentInSuggestions { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the server should force connections over HTTPS.
+ ///
public bool RequireHttps { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the server is behind a reverse proxy.
+ ///
public bool IsBehindProxy { get; set; }
+
public bool EnableNewOmdbSupport { get; set; }
public string[] RemoteIPFilter { get; set; }