Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4636 from jellyfin/MissedOne

Browse source 
[Fix for 10.7] Missed a config move
This commit is contained in:
Claus Vium 2020-12-03 08:10:02 +01:00 committed by GitHub
parent f01eff0559 6173534d33
commit fdd8b34cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Jellyfin.Server/Startup.cs
View file

@ -104,7 +104,8 @@ namespace Jellyfin.Server
app.UseBaseUrlRedirection(); app.UseBaseUrlRedirection();
// Wrap rest of configuration so everything only listens on BaseUrl. // Wrap rest of configuration so everything only listens on BaseUrl.
app.Map(_serverConfigurationManager.GetNetworkConfiguration().BaseUrl, mainApp => var config = _serverConfigurationManager.GetNetworkConfiguration();
app.Map(config.BaseUrl, mainApp =>
{ {
if (env.IsDevelopment()) if (env.IsDevelopment())
{ {
@ -122,8 +123,7 @@ namespace Jellyfin.Server
mainApp.UseCors(); mainApp.UseCors();
if (_serverConfigurationManager.GetNetworkConfiguration().RequireHttps if (config.RequireHttps && _serverApplicationHost.ListenWithHttps)
&& _serverApplicationHost.ListenWithHttps)
{ {
mainApp.UseHttpsRedirection(); mainApp.UseHttpsRedirection();
} }