Simple web server gets HTTPS.

2 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/Web/WebServerConnector.cs b/OpenSim/Server/Handlers/Web/WebServerConnector.cs
index 06fd892..3a8e906 100644
--- a/OpenSim/Server/Handlers/Web/WebServerConnector.cs
+++ b/OpenSim/Server/Handlers/Web/WebServerConnector.cs
@@ -12,6 +12,7 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Data.MySQL;
 using OpenSim.Framework;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 
@@ -82,8 +83,20 @@ namespace OpenSim.Server.Handlers.Web
             ssi.Add("grid", cfg.GetString("gridname",  "my grid"));
             ssi.Add("uri",  cfg.GetString("login", HomeURI));
             ssi.Add("version", VersionInfo.Version);
+
             server.AddHTTPHandler("/web/", WebRequestHandler);
-        }
+            IConfig networkConfig = m_Config.Configs["Network"];
+            if (null != networkConfig)
+            {
+                uint https_port = (uint) networkConfig.GetInt("https_port", 0);
+                if (0 != https_port)
+                {
+                    server = MainServer.GetHttpServer(https_port, null);
+                    if (null != server)
+                        server.AddHTTPHandler("/web/", WebRequestHandler);
+                }
+            }
+        }
 
         private Hashtable WebRequestHandler(Hashtable request)
         {
diff --git a/prebuild.xml b/prebuild.xml
index c4c5e4f..71880bc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1213,6 +1213,7 @@
       <Reference name="MySql.Data" path="../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Base"/>