CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-31 09:38:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'dev' into code-cleanup

Browse source
This commit is contained in:
Erwin de Haan 2019-01-11 12:50:36 +01:00
commit e2751d42e8
345 changed files with 2991 additions and 3236 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Emby.Server.Implementations/HttpServer/FileWriter.cs
View file

@ -145,7 +145,7 @@ namespace Emby.Server.Implementations.HttpServer
}
}
private string[] SkipLogExtensions = new string[]
private string[] SkipLogExtensions = new string[]
{
".js",
".html",

2
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -97,7 +97,7 @@ namespace Emby.Server.Implementations.HttpServer
}
/// <summary>
/// Applies the request filters. Returns whether or not the request has been handled
/// Applies the request filters. Returns whether or not the request has been handled
/// and no more processing should be done.
/// </summary>
/// <returns></returns>

2
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
View file

@ -265,7 +265,7 @@ namespace Emby.Server.Implementations.HttpServer
}
/// <summary>
/// Returns the optimized result for the IRequestContext.
/// Returns the optimized result for the IRequestContext.
/// Does not use or store results in any cache.
/// </summary>
/// <param name="request"></param>

2
Emby.Server.Implementations/HttpServer/IHttpListener.cs
View file

@ -33,7 +33,7 @@ namespace Emby.Server.Implementations.HttpServer
/// </summary>
/// <value>The web socket connecting.</value>
Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
/// <summary>
/// Starts this instance.
/// </summary>

2
Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
View file

@ -115,7 +115,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
{
info.Device = tokenInfo.DeviceName;
}
else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase))
{
if (allowTokenInfoUpdate)