aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorBlueWall2011-05-01 14:44:09 -0400
committerBlueWall2011-05-05 19:56:54 -0400
commit8ca793875318efc8db3339b25bf7fa5ddeeac218 (patch)
treecc860147bdb35f8b9d52325b7b12c9df383f17cd /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parentfix command display for debugging 'emergency-monitoring' (diff)
downloadopensim-SC_OLD-8ca793875318efc8db3339b25bf7fa5ddeeac218.zip
opensim-SC_OLD-8ca793875318efc8db3339b25bf7fa5ddeeac218.tar.gz
opensim-SC_OLD-8ca793875318efc8db3339b25bf7fa5ddeeac218.tar.bz2
opensim-SC_OLD-8ca793875318efc8db3339b25bf7fa5ddeeac218.tar.xz
Adding ssl support
Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index ea1317a..6e3a58e 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -96,6 +96,22 @@ namespace OpenSim.Region.ClientStack
96 96
97 MainServer.Instance = m_httpServer; 97 MainServer.Instance = m_httpServer;
98 98
99 // "OOB" Server
100 if (m_networkServersInfo.ssl_listener)
101 {
102 BaseHttpServer server = null;
103 server = new BaseHttpServer(
104 m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
105 m_networkServersInfo.cert_pass);
106 // Add the server to m_Servers
107 if(server != null)
108 {
109 m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
110 MainServer.AddHttpServer(server);
111 server.Start();
112 }
113 }
114
99 base.StartupSpecific(); 115 base.StartupSpecific();
100 } 116 }
101 117