Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
This commit is contained in:
commit
5f3c2f68b0
|
@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Connect
|
||||||
if (!ip.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
|
if (!ip.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
|
||||||
!ip.StartsWith("https://", 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);
|
return ip + ":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user