aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/HttpServer
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-18 14:53:34 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-18 14:53:34 -0500
commitcefd565e67ce3b8225eb2fa8a7338dc4d85b458d (patch)
tree7bb3c8d272d64954212563513a30c02c6f00a893 /MediaBrowser.Server.Implementations/HttpServer
parent5f76b59e67f64c1f24b5938808521f356a67039e (diff)
display server name in dashboard
Diffstat (limited to 'MediaBrowser.Server.Implementations/HttpServer')
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs11
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs6
2 files changed, 2 insertions, 15 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 1d7e89d28..7022dc76d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -41,8 +41,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private readonly ReaderWriterLockSlim _localEndpointLock = new ReaderWriterLockSlim();
- private readonly bool _supportsNativeWebSocket;
-
private string _certificatePath;
/// <summary>
@@ -67,12 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ILogManager logManager,
string serviceName,
string defaultRedirectPath,
- bool supportsNativeWebSocket,
params Assembly[] assembliesWithServices)
: base(serviceName, assembliesWithServices)
{
DefaultRedirectPath = defaultRedirectPath;
- _supportsNativeWebSocket = supportsNativeWebSocket;
_logger = logManager.GetLogger("HttpServer");
@@ -210,13 +206,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private IHttpListener GetListener()
{
- if (_supportsNativeWebSocket && NativeWebSocket.IsSupported)
- {
- // Certificate location is ignored here. You need to use netsh
- // to assign the certificate to the proper port.
- return new HttpListenerServer(_logger, OnRequestReceived);
- }
-
return new WebSocketSharpListener(_logger, OnRequestReceived, _certificatePath);
}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index 73d761060..d1222ab74 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -17,17 +17,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <param name="logManager">The log manager.</param>
/// <param name="serverName">Name of the server.</param>
/// <param name="defaultRedirectpath">The default redirectpath.</param>
- /// <param name="supportsNativeWebSocket">if set to <c>true</c> [supports native web socket].</param>
/// <returns>IHttpServer.</returns>
public static IHttpServer CreateServer(IApplicationHost applicationHost,
ILogManager logManager,
string serverName,
- string defaultRedirectpath,
- bool supportsNativeWebSocket)
+ string defaultRedirectpath)
{
LogManager.LogFactory = new ServerLogFactory(logManager);
- return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath, supportsNativeWebSocket);
+ return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath);
}
}
}