diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-06-11 18:23:12 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-06-11 18:23:12 -0400 |
| commit | 7a115024aabd184cc09854676a2909286858aa52 (patch) | |
| tree | 043d9ab26cc0c641fc04efa1c133d671a622cb28 /Emby.Server.Implementations/HttpServer | |
| parent | 7fba0b778ed7d1d8f8c5ff4e60945872319722c5 (diff) | |
| parent | 762e0c8d1759f7e3ced6b9c14df894d4a3d92b62 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
Diffstat (limited to 'Emby.Server.Implementations/HttpServer')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index 7de4f168c..b1a5c6dc5 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -230,7 +230,9 @@ namespace Emby.Server.Implementations.HttpServer httpRes.StatusCode = statusCode; - var errContent = NormalizeExceptionMessage(ex) ?? string.Empty; + var errContent = _hostEnvironment.IsDevelopment() + ? (NormalizeExceptionMessage(ex) ?? string.Empty) + : "Error processing request."; httpRes.ContentType = "text/plain"; httpRes.ContentLength = errContent.Length; await httpRes.WriteAsync(errContent).ConfigureAwait(false); |