OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* It turns out that Mono doesn't currently support setting the Certificate validation handler, however, it throws a NotImplemented exception. 

* Added Try/Catch/Message
0.6.0-stable
Teravus Ovares 2008-08-26 05:41:07 +00:00
parent b3a6f8d688
commit 1015ca3863
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -559,7 +559,8 @@ namespace OpenSim.Framework.Servers
foreach (string pattern in m_llsdHandlers.Keys) foreach (string pattern in m_llsdHandlers.Keys)
{ {
if (searchquery.StartsWith(searchquery))
if (pattern.StartsWith(searchquery) && searchquery.Length >= pattern.Length)
{ {
if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length) if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length)
{ {
@ -568,6 +569,10 @@ namespace OpenSim.Framework.Servers
} }
} }
// extra kicker to remove the default XMLRPC login case.. just in case..
if (path == "/")
return false;
if (String.IsNullOrEmpty(bestMatch)) if (String.IsNullOrEmpty(bestMatch))
{ {

9
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -114,7 +114,14 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
if (m_scene.Count == 0) if (m_scene.Count == 0)
{ {
scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; try
{
ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
}
catch (NotImplementedException)
{
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.");
}
} }
if (!m_scene.Contains(scene)) if (!m_scene.Contains(scene))