* It turns out that Mono doesn't currently support setting the Certificate validation handler, however, it throws a NotImplemented exception.
* Added Try/Catch/Message0.6.0-stable
parent
b3a6f8d688
commit
1015ca3863
|
@ -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))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -114,8 +114,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||||
if (m_scene.Count == 0)
|
if (m_scene.Count == 0)
|
||||||
{
|
{
|
||||||
scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
|
scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
|
||||||
|
try
|
||||||
|
{
|
||||||
ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
|
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))
|
||||||
m_scene.Add(scene);
|
m_scene.Add(scene);
|
||||||
|
|
Loading…
Reference in New Issue