1 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 65e9287..69d0b74 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -29,7 +29,9 @@ using Nini.Config;
 using log4net;
 using System.Reflection;
 using System;
+using System.Net;
 using System.Collections.Generic;
+using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Base;
@@ -53,8 +55,14 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
+            ServicePointManager.DefaultConnectionLimit = 64;
+            ServicePointManager.Expect100Continue = false;
+            ServicePointManager.UseNagleAlgorithm = false;
+
+            try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { }
+
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
-            
+
             string registryLocation;
 
             IConfig serverConfig = m_Server.Config.Configs["Startup"];
@@ -65,7 +73,7 @@ namespace OpenSim.Server
             }
 
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
-            
+
             registryLocation = serverConfig.GetString("RegistryLocation",".");
 
             IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];
@@ -153,6 +161,11 @@ namespace OpenSim.Server
 
             int res = m_Server.Run();
 
+            if(m_Server != null)
+                m_Server.Shutdown();
+
+            Util.StopThreadPool();
+
             Environment.Exit(res);
 
             return 0;