diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-07-13 17:32:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-13 17:32:45 -0400 |
| commit | e94fa791a954a08a35f646ea18bb6dac32d48694 (patch) | |
| tree | b663eba3e99973732b40df65d6f0958670577f40 | |
| parent | 0d3b399b6134378bf3114d2af4c3ebc6b1433e22 (diff) | |
| parent | c7d12cc48134ea4fd8f7169f730a47dd3a176bae (diff) | |
Merge pull request #1519 from Bond-009/mergefix
Fix merge errors
| -rw-r--r-- | Jellyfin.Server/Program.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 75b820b8e..94308a98e 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; |