aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2017-05-12 22:03:53 +0100
committerUbitUmarov2017-05-12 22:03:53 +0100
commit086eb28a9183cd0896fefc51d1a689162bd96299 (patch)
treea4a72688e3c0eaf6fbc85681af0c6e2b54f3c46f /OpenSim
parentlower connection limits again (diff)
downloadopensim-SC_OLD-086eb28a9183cd0896fefc51d1a689162bd96299.zip
opensim-SC_OLD-086eb28a9183cd0896fefc51d1a689162bd96299.tar.gz
opensim-SC_OLD-086eb28a9183cd0896fefc51d1a689162bd96299.tar.bz2
opensim-SC_OLD-086eb28a9183cd0896fefc51d1a689162bd96299.tar.xz
a bit more on ServicePointManager
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/Application.cs7
-rw-r--r--OpenSim/Server/ServerMain.cs1
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index bd2445c..bc6d7b3 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,11 +74,12 @@ namespace OpenSim
74 AppDomain.CurrentDomain.UnhandledException += 74 AppDomain.CurrentDomain.UnhandledException +=
75 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 75 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
76 76
77 if(!Util.IsWindows()) 77 if(Util.IsWindows())
78 ServicePointManager.DefaultConnectionLimit = 12;
79 else
80 ServicePointManager.DefaultConnectionLimit = 32; 78 ServicePointManager.DefaultConnectionLimit = 32;
79 else
80 ServicePointManager.DefaultConnectionLimit = 12;
81 81
82 ServicePointManager.Expect100Continue = false;
82 ServicePointManager.UseNagleAlgorithm = false; 83 ServicePointManager.UseNagleAlgorithm = false;
83 84
84 // Add the arguments supplied when running the application to the configuration 85 // Add the arguments supplied when running the application to the configuration
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 6938db7..96b0a82 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Server
55 public static int Main(string[] args) 55 public static int Main(string[] args)
56 { 56 {
57 ServicePointManager.DefaultConnectionLimit = 64; 57 ServicePointManager.DefaultConnectionLimit = 64;
58 ServicePointManager.Expect100Continue = false;
58 ServicePointManager.UseNagleAlgorithm = false; 59 ServicePointManager.UseNagleAlgorithm = false;
59 60
60 m_Server = new HttpServerBase("R.O.B.U.S.T.", args); 61 m_Server = new HttpServerBase("R.O.B.U.S.T.", args);