aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs9
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs18
3 files changed, 3 insertions, 25 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 2582b7b..788a0b9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -317,6 +317,7 @@ namespace OpenSim.Framework.Servers.HttpServer
317 StreamReader reader = new StreamReader(requestStream, encoding); 317 StreamReader reader = new StreamReader(requestStream, encoding);
318 318
319 string requestBody = reader.ReadToEnd(); 319 string requestBody = reader.ReadToEnd();
320 reader.Close();
320 321
321 Hashtable keysvals = new Hashtable(); 322 Hashtable keysvals = new Hashtable();
322 Hashtable headervals = new Hashtable(); 323 Hashtable headervals = new Hashtable();
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index f85509a..d0a37d0 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
34 public delegate void RequestMethod(UUID requestID, Hashtable request); 34 public delegate void RequestMethod(UUID requestID, Hashtable request);
35 public delegate bool HasEventsMethod(UUID requestID, UUID pId); 35 public delegate bool HasEventsMethod(UUID requestID, UUID pId);
36 36
37 public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request); 37 public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
38 38
39 public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId); 39 public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
40 40
@@ -47,13 +47,6 @@ namespace OpenSim.Framework.Servers.HttpServer
47 public UUID Id; 47 public UUID Id;
48 public int TimeOutms; 48 public int TimeOutms;
49 public EventType Type; 49 public EventType Type;
50 // must be set true for cases where GetEvents needs to access the request body
51 // at each pool. http can start processing before having the full body
52 // but not sure if this is active for poll events
53 // if original coder thinked its needed i keep it
54 // if the Event has a Request method this seems to smoke for now
55 // seems for now nothing actually uses this so default to false
56 public bool GetEventsNeedsRequestBody = false;
57 50
58 public enum EventType : int 51 public enum EventType : int
59 { 52 {
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c379747..c09bf14 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -336,23 +336,7 @@ namespace OpenSim.Framework.Servers.HttpServer
336 { 336 {
337 if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id)) 337 if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
338 { 338 {
339 string strreq = ""; 339 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
340 if (req.PollServiceArgs.GetEventsNeedsRequestBody)
341 {
342 try
343 {
344 // should we try to seek back? fear we can't
345 str = new StreamReader(req.Request.Body);
346 strreq = str.ReadToEnd();
347 str.Close();
348 }
349 catch
350 {
351 continue;
352 }
353 }
354
355 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, strreq);
356 340
357 if (responsedata == null) 341 if (responsedata == null)
358 continue; 342 continue;