aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/ServerManager
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:15:34 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:15:34 -0500
commitea30f766b6348a0d846d9f72191a8c4959bf2483 (patch)
treeb1706bdb6b859103a4d066160f21a0e9831522a3 /MediaBrowser.Server.Implementations/ServerManager
parent628c6cbc28f5a744785731dd4e94ec7a1f881dd2 (diff)
parentbb02d68cebb2379623dda5e7803135d80f15b27f (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/ServerManager')
-rw-r--r--MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index 7a23d8e08..ef2fef746 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -99,22 +99,22 @@ namespace MediaBrowser.Server.Implementations.ServerManager
/// <summary>
/// Starts this instance.
/// </summary>
- public void Start(IEnumerable<string> urlPrefixes)
+ public void Start(IEnumerable<string> urlPrefixes, string certificatePath)
{
- ReloadHttpServer(urlPrefixes);
+ ReloadHttpServer(urlPrefixes, certificatePath);
}
/// <summary>
/// Restarts the Http Server, or starts it if not currently running
/// </summary>
- private void ReloadHttpServer(IEnumerable<string> urlPrefixes)
+ private void ReloadHttpServer(IEnumerable<string> urlPrefixes, string certificatePath)
{
_logger.Info("Loading Http Server");
try
{
HttpServer = _applicationHost.Resolve<IHttpServer>();
- HttpServer.StartServer(urlPrefixes);
+ HttpServer.StartServer(urlPrefixes, certificatePath);
}
catch (SocketException ex)
{