diff options
| author | UbitUmarov | 2017-05-31 07:21:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-31 07:21:21 +0100 |
| commit | 55babdc16090397499081f0428500babe383ff3a (patch) | |
| tree | efb2f7ec13abba489d6318ebace8a86c6cde66c6 /OpenSim/Region/Application | |
| parent | disable llhttprequests secure con, since it still collides with main ssl sett... (diff) | |
| parent | we don't need to keep refs to baked textures assets (diff) | |
| download | opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 447afb4..66ce8e5 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -79,10 +79,9 @@ namespace OpenSim | |||
| 79 | else | 79 | else |
| 80 | { | 80 | { |
| 81 | ServicePointManager.DefaultConnectionLimit = 12; | 81 | ServicePointManager.DefaultConnectionLimit = 12; |
| 82 | try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some crazy mono decides to have it infinity | ||
| 83 | catch { } | ||
| 84 | } | 82 | } |
| 85 | 83 | ||
| 84 | try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { } | ||
| 86 | ServicePointManager.Expect100Continue = false; | 85 | ServicePointManager.Expect100Continue = false; |
| 87 | ServicePointManager.UseNagleAlgorithm = false; | 86 | ServicePointManager.UseNagleAlgorithm = false; |
| 88 | 87 | ||