aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/HttpServer
diff options
context:
space:
mode:
authorClaus Vium <clausvium@gmail.com>2019-02-26 20:13:48 +0100
committerClaus Vium <clausvium@gmail.com>2019-02-26 22:11:21 +0100
commita85488cd205532662c59ada5032dc81c0315543b (patch)
treee46735657f15253650f25759580cb1df66c773fe /Emby.Server.Implementations/HttpServer
parent5a7cca9d1bdc5280626a6654cdbd8c0d45016af5 (diff)
Fix websockets array index out of bounds and some cleanup
Diffstat (limited to 'Emby.Server.Implementations/HttpServer')
-rw-r--r--Emby.Server.Implementations/HttpServer/HttpListenerHost.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index cfe0bbe97..a3eaa2fb5 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -21,6 +21,7 @@ using MediaBrowser.Model.Events;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Services;
+using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using ServiceStack.Text.Jsv;
@@ -767,6 +768,10 @@ namespace Emby.Server.Implementations.HttpServer
return _jsonSerializer.DeserializeFromStreamAsync(stream, type);
}
+ public Task ProcessWebSocketRequest(HttpContext context)
+ {
+ return _websocketlistener.ProcessWebSocketRequest(context);
+ }
//TODO Add Jellyfin Route Path Normalizer
private static string NormalizeEmbyRoutePath(string path)
@@ -801,7 +806,7 @@ namespace Emby.Server.Implementations.HttpServer
private bool _disposed;
private readonly object _disposeLock = new object();
- public WebSocketSharpListener _websocketlistener;
+ private readonly WebSocketSharpListener _websocketlistener;
protected virtual void Dispose(bool disposing)
{