* Made Seed CAP response respect the SSL setting.

1 files changed, 27 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 4a3d00f..ed31c45 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework.Communications.Capabilities
         private BaseHttpServer m_httpListener;
         private string m_httpListenerHostName;
         private uint m_httpListenerPort;
+        private bool m_useSSL = false;
 
         /// <summary></summary>
         /// CapsHandlers is a cap handler container but also takes
@@ -53,10 +54,30 @@ namespace OpenSim.Framework.Communications.Capabilities
         /// server</param>
         /// <param name="httpListenerPort">HTTP port</param>
         public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
+         : this (httpListener,httpListenerHostname,httpListenerPort, false)
+        {
+        }
+
+        /// <summary></summary>
+        /// CapsHandlers is a cap handler container but also takes
+        /// care of adding and removing cap handlers to and from the
+        /// supplied BaseHttpServer.
+        /// </summary>
+        /// <param name="httpListener">base HTTP server</param>
+        /// <param name="httpListenerHostname">host name of the HTTP
+        /// server</param>
+        /// <param name="httpListenerPort">HTTP port</param>
+        public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
         {
             m_httpListener = httpListener;
             m_httpListenerHostName = httpListenerHostname;
             m_httpListenerPort = httpListenerPort;
+            m_useSSL = https;
+            if (m_useSSL)
+            {
+                m_httpListenerHostName = httpListener.SSLCommonName;
+                m_httpListenerPort = httpListener.SSLPort;
+            }
         }
 
         /// <summary>
@@ -130,7 +151,12 @@ namespace OpenSim.Framework.Communications.Capabilities
             get
             {
                 Hashtable caps = new Hashtable();
-                string baseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
+                string protocol = "http://";
+                
+                if (m_useSSL)
+                    protocol = "https://";
+
+                string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
                 foreach (string capsName in m_capsHandlers.Keys)
                 {
                     // skip SEED cap