From c7d12cc48134ea4fd8f7169f730a47dd3a176bae Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sun, 7 Jul 2019 00:43:43 +0200 Subject: [PATCH] Fix merge errors --- Jellyfin.Server/Program.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 75b820b8e1..94308a98e8 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -120,13 +120,6 @@ namespace Jellyfin.Server // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others. ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit); -// CA5359: Do Not Disable Certificate Validation -#pragma warning disable CA5359 - - // Increase the max http request limit - // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others. - ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit); - // Disable the "Expect: 100-Continue" header by default // http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c ServicePointManager.Expect100Continue = false;