aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom2011-01-31 18:01:53 -0800
committerTom2011-01-31 18:01:53 -0800
commite5ef993f2b7ee8b7777d8a413d815c3e8e2ca786 (patch)
tree45e6ba5096a70b4975614b806cad1b178538696b /OpenSim
parentIf llHTTPRequest results in an error, still attempt to get the response text.... (diff)
downloadopensim-SC_OLD-e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786.zip
opensim-SC_OLD-e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786.tar.gz
opensim-SC_OLD-e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786.tar.bz2
opensim-SC_OLD-e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786.tar.xz
Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request!
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 4851b33..89f5da3 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
48 public string url; 48 public string url;
49 public UUID urlcode; 49 public UUID urlcode;
50 public Dictionary<UUID, RequestData> requests; 50 public Dictionary<UUID, RequestData> requests;
51 public bool responseSent;
52 } 51 }
53 52
54 public class RequestData 53 public class RequestData
@@ -61,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
61 //public ManualResetEvent ev; 60 //public ManualResetEvent ev;
62 public bool requestDone; 61 public bool requestDone;
63 public int startTime; 62 public int startTime;
63 public bool responseSent;
64 public string uri; 64 public string uri;
65 } 65 }
66 66
@@ -200,13 +200,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
200 if (m_RequestMap.ContainsKey(request)) 200 if (m_RequestMap.ContainsKey(request))
201 { 201 {
202 UrlData urlData = m_RequestMap[request]; 202 UrlData urlData = m_RequestMap[request];
203 if (!urlData.responseSent) 203 if (!urlData.requests[request].responseSent)
204 { 204 {
205 urlData.requests[request].responseCode = status; 205 urlData.requests[request].responseCode = status;
206 urlData.requests[request].responseBody = body; 206 urlData.requests[request].responseBody = body;
207 //urlData.requests[request].ev.Set(); 207 //urlData.requests[request].ev.Set();
208 urlData.requests[request].requestDone = true; 208 urlData.requests[request].requestDone = true;
209 urlData.responseSent = true; 209 urlData.requests[request].responseSent = true;
210 } 210 }
211 } 211 }
212 else 212 else