aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:56:53 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:56:53 -0500
commit5f3c2f68b0a956ce28b8e48bf8fd20c89e44f5d9 (patch)
tree8b6bdd6d840cfeb738d70ef5e782711f71b905f8 /MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
parentea30f766b6348a0d846d9f72191a8c4959bf2483 (diff)
parente1d3e001cfc08e35477427d6243383d74a67fc8a (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Connect/ConnectManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Connect/ConnectManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index b703b204e..9625593d1 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Connect
if (!ip.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
!ip.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
{
- ip = "http://" + ip;
+ ip = (_config.Configuration.UseHttps ? "https://" : "http://") + ip;
}
return ip + ":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture);