diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 6d403c898..271c20f4e 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -821,7 +821,7 @@ namespace MediaBrowser.Api.Playback
{
get
{
- return true;
+ return false;
}
}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 94bd30d0b..2ce039454 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -20,6 +20,12 @@ namespace MediaBrowser.Model.Configuration
/// The public mapped port.
public int PublicPort { get; set; }
+ ///
+ /// Gets or sets the public HTTPS port.
+ ///
+ /// The public HTTPS port.
+ public int PublicHttpsPort { get; set; }
+
///
/// Gets or sets the HTTP server port number.
///
@@ -204,6 +210,7 @@ namespace MediaBrowser.Model.Configuration
{
ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096;
+ PublicHttpsPort = 8920;
HttpServerPortNumber = 8096;
HttpsPortNumber = 8920;
EnableHttps = false;
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index d3a29f420..1cc3365e5 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -81,7 +81,10 @@ namespace MediaBrowser.Server.Implementations.Connect
ip = (_appHost.EnableHttps ? "https://" : "http://") + ip;
}
- return ip + ":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture);
+ ip += ":";
+ ip += _appHost.EnableHttps ? _config.Configuration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture) : _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture);
+
+ return ip;
}
return null;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 4371739b7..5c69db3e1 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -145,6 +145,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
_createdRules.Add(address);
CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort);
+ CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort);
}
}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 683a5a639..0151c0f7d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -515,13 +515,15 @@
"NewCollectionNameExample": "Example: Star Wars Collection",
"OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
"ButtonCreate": "Create",
- "LabelLocalHttpServerPortNumber": "Local port number:",
+ "LabelLocalHttpServerPortNumber": "Local http port number:",
"LabelLocalHttpServerPortNumberHelp": "The tcp port number that Media Browser's http server should bind to.",
- "LabelPublicPort": "Public port number:",
- "LabelPublicPortHelp": "The public port number that should be mapped to the local port.",
+ "LabelPublicHttpPort": "Public http port number:",
+ "LabelPublicHttpPortHelp": "The public port number that should be mapped to the local http port.",
+ "LabelPublicHttpsPort": "Public https port number:",
+ "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local https port.",
"LabelEnableHttps": "Enable https for remote connections",
"LabelEnableHttpsHelp": "If enabled, the server will report an https url as it's external address.",
- "LabelHttpsPort": "Local https port:",
+ "LabelHttpsPort": "Local https port number:",
"LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.",
"LabelCertificatePath": "SSL Certificate path:",
"LabelCertificatePathHelp": "The path on the file system to the ssl certificate .pfx file.",