Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore

This commit is contained in:
Cody Robibero
2021-09-03 11:01:55 -06:00
220 changed files with 4473 additions and 2339 deletions

View File

@@ -75,8 +75,7 @@ namespace Jellyfin.Server.Implementations.Security
auth.TryGetValue("Token", out token);
}
#pragma warning disable CA1508
// headers can return StringValues.Empty
#pragma warning disable CA1508 // string.IsNullOrEmpty(token) is always false.
if (string.IsNullOrEmpty(token))
{
token = headers["X-Emby-Token"];