diff options
| author | Jan Müller <github@lonebyte.de> | 2023-09-16 12:40:05 +0200 |
|---|---|---|
| committer | Jan Müller <github@lonebyte.de> | 2023-09-16 12:40:05 +0200 |
| commit | fd022ee6850c364a9f3c2d8de2b06f26ee1b8abf (patch) | |
| tree | d2aec7c1a9ae2d2b77b5c764a99a4434a6e4a21c /Emby.Server.Implementations/HttpServer/WebSocketManager.cs | |
| parent | 79cff704ff4e00895a8d2b97ecbbea3e2f5f56fc (diff) | |
| parent | 61155adecd8a69bb476487f9fc81175b0c4185b7 (diff) | |
Merge branch 'master' into flac-hls-fixes
# Conflicts:
# Jellyfin.Api/Controllers/DynamicHlsController.cs
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/WebSocketManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/WebSocketManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs index ecfb242f6..52f14b0b1 100644 --- a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs +++ b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs @@ -51,6 +51,7 @@ namespace Emby.Server.Implementations.HttpServer using var connection = new WebSocketConnection( _loggerFactory.CreateLogger<WebSocketConnection>(), webSocket, + authorizationInfo, context.GetNormalizedRemoteIP()) { OnReceive = ProcessWebSocketMessageReceived @@ -64,7 +65,7 @@ namespace Emby.Server.Implementations.HttpServer await Task.WhenAll(tasks).ConfigureAwait(false); - await connection.ProcessAsync().ConfigureAwait(false); + await connection.ReceiveAsync().ConfigureAwait(false); _logger.LogInformation("WS {IP} closed", context.Connection.RemoteIpAddress); } catch (Exception ex) // Otherwise ASP.Net will ignore the exception |