aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs9
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 13c5752..303ce64 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -559,7 +559,8 @@ namespace OpenSim.Framework.Servers
559 559
560 foreach (string pattern in m_llsdHandlers.Keys) 560 foreach (string pattern in m_llsdHandlers.Keys)
561 { 561 {
562 if (searchquery.StartsWith(searchquery)) 562
563 if (pattern.StartsWith(searchquery) && searchquery.Length >= pattern.Length)
563 { 564 {
564 if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length) 565 if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length)
565 { 566 {
@@ -568,6 +569,10 @@ namespace OpenSim.Framework.Servers
568 } 569 }
569 } 570 }
570 571
572 // extra kicker to remove the default XMLRPC login case.. just in case..
573 if (path == "/")
574 return false;
575
571 if (String.IsNullOrEmpty(bestMatch)) 576 if (String.IsNullOrEmpty(bestMatch))
572 { 577 {
573 578
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 5874d9b..89a01f0 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -114,7 +114,14 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
114 if (m_scene.Count == 0) 114 if (m_scene.Count == 0)
115 { 115 {
116 scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); 116 scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
117 ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; 117 try
118 {
119 ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
120 }
121 catch (NotImplementedException)
122 {
123 m_log.Error("[OGP]: Certificate validation handler change not supported. You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
124 }
118 } 125 }
119 126
120 if (!m_scene.Contains(scene)) 127 if (!m_scene.Contains(scene))