diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-15 13:27:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 13:27:59 -0400 |
| commit | c84747d88aa40a5063015cf28c8da06d417d6649 (patch) | |
| tree | 06c71ff3dcc7e39a401ae6ac0abca2e4192f1495 /Emby.Server.Implementations/HttpServer | |
| parent | e93aed7b6c6b72156cf336948efc6a9ff35c530f (diff) | |
| parent | 07b5c6a750a118405a840277dd0280f25c911924 (diff) | |
Merge pull request #2709 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/HttpServer')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 3 | ||||
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/ResponseFilter.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index 79209d438..28c23b766 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -598,9 +598,10 @@ namespace Emby.Server.Implementations.HttpServer { ErrorHandler(ex, httpReq, false); } + catch (Exception ex) { - ErrorHandler(ex, httpReq); + ErrorHandler(ex, httpReq, !string.Equals(ex.GetType().Name, "SocketException", StringComparison.OrdinalIgnoreCase)); } finally { diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs index 57eef5db0..ac36f8f51 100644 --- a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs +++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs @@ -53,7 +53,7 @@ namespace Emby.Server.Implementations.HttpServer { if (!hasHeaders.Headers.ContainsKey("Server")) { - hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50"; + hasHeaders.Headers["Server"] = "Microsoft-NetCore/2.0, UPnP/1.0 DLNADOC/1.50"; //hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1"; } |