mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-27 11:14:47 +03:00
Merge branch 'master' into network-rewrite
This commit is contained in:
@@ -182,7 +182,7 @@ namespace Jellyfin.Server
|
||||
|
||||
// This must be injected before any path related middleware.
|
||||
mainApp.UsePathTrim();
|
||||
mainApp.UseStaticFiles();
|
||||
|
||||
if (appConfig.HostWebClient())
|
||||
{
|
||||
var extensionProvider = new FileExtensionContentTypeProvider();
|
||||
@@ -190,6 +190,11 @@ namespace Jellyfin.Server
|
||||
// subtitles octopus requires .data, .mem files.
|
||||
extensionProvider.Mappings.Add(".data", MediaTypeNames.Application.Octet);
|
||||
extensionProvider.Mappings.Add(".mem", MediaTypeNames.Application.Octet);
|
||||
mainApp.UseDefaultFiles(new DefaultFilesOptions
|
||||
{
|
||||
FileProvider = new PhysicalFileProvider(_serverConfigurationManager.ApplicationPaths.WebPath),
|
||||
RequestPath = "/web"
|
||||
});
|
||||
mainApp.UseStaticFiles(new StaticFileOptions
|
||||
{
|
||||
FileProvider = new PhysicalFileProvider(_serverConfigurationManager.ApplicationPaths.WebPath),
|
||||
@@ -200,6 +205,7 @@ namespace Jellyfin.Server
|
||||
mainApp.UseRobotsRedirection();
|
||||
}
|
||||
|
||||
mainApp.UseStaticFiles();
|
||||
mainApp.UseAuthentication();
|
||||
mainApp.UseJellyfinApiSwagger(_serverConfigurationManager);
|
||||
mainApp.UseQueryStringDecoding();
|
||||
|
||||
Reference in New Issue
Block a user