diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index bd2445cbc8..bc6d7b3da4 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,11 +74,12 @@ namespace OpenSim
             AppDomain.CurrentDomain.UnhandledException +=
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-            if(!Util.IsWindows())
-                ServicePointManager.DefaultConnectionLimit = 12;
-            else
+            if(Util.IsWindows())
                 ServicePointManager.DefaultConnectionLimit = 32;
+            else
+                ServicePointManager.DefaultConnectionLimit = 12;
 
+            ServicePointManager.Expect100Continue = false;
             ServicePointManager.UseNagleAlgorithm = false;
 
             // Add the arguments supplied when running the application to the configuration
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 6938db7ca4..96b0a82abf 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Server
         public static int Main(string[] args)
         {
             ServicePointManager.DefaultConnectionLimit = 64;
+            ServicePointManager.Expect100Continue = false;
             ServicePointManager.UseNagleAlgorithm = false;
 
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);