From dbbbec48dfbc51f30953d8a46f4fc8f192bd277c Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 14 Sep 2008 18:39:17 +0000
Subject: * This update makes configuring SSL a little easier on Windows XP. 
 It also makes it possible to run a HTTPS server on the region.   It also has
 a junk Certification authority for test purposes. * There are still a lot of
 things that are hard coded to use http.   They need to be fixed. * Also
 includes directions * A standard junk PEM file to append to
 app_settings/CA.pem in the client so SSL will work

---
 OpenSim/Region/ClientStack/RegionApplicationBase.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 8bb35c1..469c084 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -81,7 +81,12 @@ namespace OpenSim.Region.ClientStack
 
             Initialize();
 
-            m_httpServer = new BaseHttpServer(m_httpServerPort);
+            m_httpServer = new BaseHttpServer(m_httpServerPort,m_networkServersInfo.HttpUsesSSL,m_networkServersInfo.httpSSLPort, m_networkServersInfo.HttpSSLCN);
+            if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort))
+            {
+                m_log.Error("[HTTP]: HTTP Server config failed.   HTTP Server and HTTPS server must be on different ports");
+            }
+
 
             m_log.Info("[REGION]: Starting HTTP server");
 
-- 
cgit v1.1