Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-05-31 07:21:21 +01:00
26 changed files with 287 additions and 682 deletions

View File

@@ -82,8 +82,7 @@ namespace OpenSim.Server
ServicePointManager.UseNagleAlgorithm = false;
ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some mono decides to have it infinity
catch { }
try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { }
m_Server = new HttpServerBase("R.O.B.U.S.T.", args);