From 13fe3546c31376631ebc557b8d379c157b5b7c37 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 17 Feb 2013 17:43:32 +0100
Subject: Correctly remove https:// URLs from the http server.

---
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index da59eab..24e925e 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public string url;
         public UUID urlcode;
         public Dictionary<UUID, RequestData> requests;
+        public bool isSsl;
     }
 
     public class RequestData
@@ -184,6 +185,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.engine = engine;
                 urlData.url = url;
                 urlData.urlcode = urlcode;
+                urlData.isSsl = false;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
                 m_UrlMap[url] = urlData;
@@ -229,6 +231,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.engine = engine;
                 urlData.url = url;
                 urlData.urlcode = urlcode;
+                urlData.isSsl = true;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
                 
@@ -394,7 +397,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         private void RemoveUrl(UrlData data)
         {
-            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
+            if (data.isSsl)
+                m_HttpsServer.RemoveHTTPHandler("", "/lslhttps/"+data.urlcode.ToString()+"/");
+            else
+                m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
         }
 
         private Hashtable NoEvents(UUID requestID, UUID sessionID)
-- 
cgit v1.1