From 49b799adbe3d65973b136bee758584748ecf6c2a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 5 Sep 2017 15:49:02 -0400
Subject: 3.2.30.8

---
 Emby.Server.Implementations/Session/HttpSessionController.cs    | 6 +-----
 Emby.Server.Implementations/Session/SessionWebSocketListener.cs | 1 +
 Emby.Server.Implementations/Session/WebSocketController.cs      | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'Emby.Server.Implementations/Session')

diff --git a/Emby.Server.Implementations/Session/HttpSessionController.cs b/Emby.Server.Implementations/Session/HttpSessionController.cs
index dbac76bb4..bd53da1bd 100644
--- a/Emby.Server.Implementations/Session/HttpSessionController.cs
+++ b/Emby.Server.Implementations/Session/HttpSessionController.cs
@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace Emby.Server.Implementations.Session
 {
-    public class HttpSessionController : ISessionController, IDisposable
+    public class HttpSessionController : ISessionController
     {
         private readonly IHttpClient _httpClient;
         private readonly IJsonSerializer _json;
@@ -195,9 +195,5 @@ namespace Emby.Server.Implementations.Session
 
             return "?" + args;
         }
-
-        public void Dispose()
-        {
-        }
     }
 }
diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index 2735bb237..a5af843db 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -102,6 +102,7 @@ namespace Emby.Server.Implementations.Session
         public void Dispose()
         {
             _serverManager.WebSocketConnected -= _serverManager_WebSocketConnected;
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs
index f0ff0b5dd..ee9ee8969 100644
--- a/Emby.Server.Implementations/Session/WebSocketController.cs
+++ b/Emby.Server.Implementations/Session/WebSocketController.cs
@@ -283,6 +283,7 @@ namespace Emby.Server.Implementations.Session
             {
                 socket.Closed -= connection_Closed;
             }
+            GC.SuppressFinalize(this);
         }
     }
 }
-- 
cgit v1.2.3


From b01489c40fbd0aa6013f1ed448d902094a186f9f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 17 Sep 2017 13:09:17 -0400
Subject: fix signature

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/Session')

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 0692a0ba5..6f185bc81 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1416,7 +1416,7 @@ namespace Emby.Server.Implementations.Session
 
             if (enforcePassword)
             {
-                var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
+                var result = await _userManager.AuthenticateUser(request.Username, request.Password, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
 
                 if (result == null)
                 {
-- 
cgit v1.2.3