aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2012-09-26 15:41:57 +0100
committerUbitUmarov2012-09-26 15:41:57 +0100
commit7e3eba1064197024690c5b3cae4c2cf87319e48c (patch)
tree35217d5302061d21540073e9a0b4bd4ef441a0e8 /OpenSim/Framework
parentUriModule GetEvents also doesn't need a request body (diff)
downloadopensim-SC_OLD-7e3eba1064197024690c5b3cae4c2cf87319e48c.zip
opensim-SC_OLD-7e3eba1064197024690c5b3cae4c2cf87319e48c.tar.gz
opensim-SC_OLD-7e3eba1064197024690c5b3cae4c2cf87319e48c.tar.bz2
opensim-SC_OLD-7e3eba1064197024690c5b3cae4c2cf87319e48c.tar.xz
Seems nothing actually need the request body for getevents. so change
control flag to false
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs10
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs3
2 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 9b27a6e..f85509a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -46,8 +46,14 @@ namespace OpenSim.Framework.Servers.HttpServer
46 public RequestMethod Request; 46 public RequestMethod Request;
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 public bool GetEventsNeedsRequest = true; 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;
51 57
52 public enum EventType : int 58 public enum EventType : int
53 { 59 {
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index cc9ddc2..c379747 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -337,10 +337,11 @@ namespace OpenSim.Framework.Servers.HttpServer
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 string strreq = "";
340 if (req.PollServiceArgs.GetEventsNeedsRequest) 340 if (req.PollServiceArgs.GetEventsNeedsRequestBody)
341 { 341 {
342 try 342 try
343 { 343 {
344 // should we try to seek back? fear we can't
344 str = new StreamReader(req.Request.Body); 345 str = new StreamReader(req.Request.Body);
345 strreq = str.ReadToEnd(); 346 strreq = str.ReadToEnd();
346 str.Close(); 347 str.Close();