aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs8
1 files changed, 7 insertions, 1 deletions
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
50 public string url; 50 public string url;
51 public UUID urlcode; 51 public UUID urlcode;
52 public Dictionary<UUID, RequestData> requests; 52 public Dictionary<UUID, RequestData> requests;
53 public bool isSsl;
53 } 54 }
54 55
55 public class RequestData 56 public class RequestData
@@ -184,6 +185,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
184 urlData.engine = engine; 185 urlData.engine = engine;
185 urlData.url = url; 186 urlData.url = url;
186 urlData.urlcode = urlcode; 187 urlData.urlcode = urlcode;
188 urlData.isSsl = false;
187 urlData.requests = new Dictionary<UUID, RequestData>(); 189 urlData.requests = new Dictionary<UUID, RequestData>();
188 190
189 m_UrlMap[url] = urlData; 191 m_UrlMap[url] = urlData;
@@ -229,6 +231,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
229 urlData.engine = engine; 231 urlData.engine = engine;
230 urlData.url = url; 232 urlData.url = url;
231 urlData.urlcode = urlcode; 233 urlData.urlcode = urlcode;
234 urlData.isSsl = true;
232 urlData.requests = new Dictionary<UUID, RequestData>(); 235 urlData.requests = new Dictionary<UUID, RequestData>();
233 236
234 237
@@ -394,7 +397,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
394 397
395 private void RemoveUrl(UrlData data) 398 private void RemoveUrl(UrlData data)
396 { 399 {
397 m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/"); 400 if (data.isSsl)
401 m_HttpsServer.RemoveHTTPHandler("", "/lslhttps/"+data.urlcode.ToString()+"/");
402 else
403 m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
398 } 404 }
399 405
400 private Hashtable NoEvents(UUID requestID, UUID sessionID) 406 private Hashtable NoEvents(UUID requestID, UUID sessionID)