ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert some default params and fixes to SSL support

Browse Source
This commit is contained in:
Adil El Farissi
2024-04-26 06:12:29 +00:00
committed by UbitUmarov
parent ac9ed3d5d1
commit 207c3d1e71
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -285,7 +285,7 @@ namespace OpenSim
Uri configUri;
return Uri.TryCreate(file, UriKind.Absolute,
out configUri) && configUri.Scheme == Uri.UriSchemeHttp;
out configUri) && (configUri.Scheme == Uri.UriSchemeHttp || configUri.Scheme == Uri.UriSchemeHttps);
}
/// <summary>

5
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -92,6 +92,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
protected bool m_enabled = false;
protected string m_ErrorStr;
protected uint m_HttpsPort = 0;
protected uint m_HttpPort = 0;
protected IHttpServer m_HttpServer = null;
protected IHttpServer m_HttpsServer = null;
@@ -134,6 +135,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
bool ssl_enabled = config.Configs["Network"].GetBoolean("https_listener", false);
m_HttpPort = (uint)config.Configs["Network"].GetInt("http_listener_port", 9000);
if (ssl_enabled)
m_HttpsPort = (uint)config.Configs["Network"].GetInt("https_port", (int)m_HttpsPort);
}
@@ -180,7 +183,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
{
// There can only be one
//
m_HttpServer = MainServer.Instance;
m_HttpServer = MainServer.GetHttpServer(m_HttpPort);
//
// We can use the https if it is enabled
if (m_HttpsPort > 0)

4
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -339,7 +339,7 @@ namespace OpenSim.Server.Base
Uri configUri;
return Uri.TryCreate(file, UriKind.Absolute,
out configUri) && configUri.Scheme == Uri.UriSchemeHttp;
out configUri) && (configUri.Scheme == Uri.UriSchemeHttp || configUri.Scheme == Uri.UriSchemeHttps);
}
IConfigSource ReadConfigSource(string iniFile)
@@ -352,7 +352,7 @@ namespace OpenSim.Server.Base
try
{
if (Uri.TryCreate(iniFile, UriKind.Absolute, out configUri) &&
configUri.Scheme == Uri.UriSchemeHttp)
(configUri.Scheme == Uri.UriSchemeHttp || configUri.Scheme == Uri.UriSchemeHttps))
{
XmlReader r = XmlReader.Create(iniFile);
s = new XmlConfigSource(r);

2
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@@ -201,7 +201,7 @@ namespace OpenSim.Tools.Configger
Uri configUri;
return Uri.TryCreate(file, UriKind.Absolute,
out configUri) && configUri.Scheme == Uri.UriSchemeHttp;
out configUri) && (configUri.Scheme == Uri.UriSchemeHttp || configUri.Scheme == Uri.UriSchemeHttps);
}
/// <summary>