From 5c661baf6c197caef73e6a8fe5a2223d00a2a6ba Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 26 Apr 2014 02:42:30 +0200
Subject: Allow opening a https port using only http so that nginx can be used
 for ssl

---
 .../Region/ClientStack/RegionApplicationBase.cs    | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 853b72d..287c278 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -100,13 +100,25 @@ namespace OpenSim.Region.ClientStack
             // "OOB" Server
             if (m_networkServersInfo.ssl_listener)
             {
-                BaseHttpServer server = new BaseHttpServer(
-                    m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
-                    m_networkServersInfo.cert_pass);
+                if (!m_networkServersInfo.ssl_external)
+                {
+                    BaseHttpServer server = new BaseHttpServer(
+                        m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
+                        m_networkServersInfo.cert_pass);
 
-                m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
-                MainServer.AddHttpServer(server);
-                server.Start();
+                    m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
+                    MainServer.AddHttpServer(server);
+                    server.Start();
+                }
+                else
+                {
+                    BaseHttpServer server = new BaseHttpServer(
+                        m_networkServersInfo.https_port);
+
+                    m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0} for external HTTPS", server.Port);
+                    MainServer.AddHttpServer(server);
+                    server.Start();
+                }
             }
             
             base.StartupSpecific();
@@ -132,4 +144,4 @@ namespace OpenSim.Region.ClientStack
             return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1