diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-05-07 02:24:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 02:24:42 +0900 |
| commit | 176159d0a886672ae8445c6939b50bfdaffa8153 (patch) | |
| tree | eac70d4ff9197fc598e47852452ab0a0540ac87b /Jellyfin.Server/Program.cs | |
| parent | 1c210d930c36bcb4e0bacce238f905628ef75966 (diff) | |
| parent | ba2134de13a94017038a23dee5656e1e0831783a (diff) | |
Merge pull request #2969 from BaronGreenback/my-feature
http in development mode crashed -
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 8093efebe..ae423532e 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -297,7 +297,6 @@ namespace Jellyfin.Server { _logger.LogInformation("Kestrel listening on {IpAddress}", address); options.Listen(address, appHost.HttpPort); - if (appHost.EnableHttps && appHost.Certificate != null) { options.Listen(address, appHost.HttpsPort, listenOptions => @@ -308,11 +307,18 @@ namespace Jellyfin.Server } else if (builderContext.HostingEnvironment.IsDevelopment()) { - options.Listen(address, appHost.HttpsPort, listenOptions => + try { - listenOptions.UseHttps(); - listenOptions.Protocols = HttpProtocols.Http1AndHttp2; - }); + options.Listen(address, appHost.HttpsPort, listenOptions => + { + listenOptions.UseHttps(); + listenOptions.Protocols = HttpProtocols.Http1AndHttp2; + }); + } + catch (InvalidOperationException ex) + { + _logger.LogError(ex, "Failed to listen to HTTPS using the ASP.NET Core HTTPS development certificate. Please ensure it has been installed and set as trusted."); + } } } } @@ -331,11 +337,18 @@ namespace Jellyfin.Server } else if (builderContext.HostingEnvironment.IsDevelopment()) { - options.ListenAnyIP(appHost.HttpsPort, listenOptions => + try { - listenOptions.UseHttps(); - listenOptions.Protocols = HttpProtocols.Http1AndHttp2; - }); + options.ListenAnyIP(appHost.HttpsPort, listenOptions => + { + listenOptions.UseHttps(); + listenOptions.Protocols = HttpProtocols.Http1AndHttp2; + }); + } + catch (InvalidOperationException ex) + { + _logger.LogError(ex, "Failed to listen to HTTPS using the ASP.NET Core HTTPS development certificate. Please ensure it has been installed and set as trusted."); + } } } }) |