diff options
7 files changed, 7 insertions, 29 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; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index ebfe687..e113c60 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -419,7 +419,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
419 | } | 419 | } |
420 | } | 420 | } |
421 | 421 | ||
422 | public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request) | 422 | public Hashtable GetEvents(UUID requestID, UUID pAgentId) |
423 | { | 423 | { |
424 | if (DebugLevel >= 2) | 424 | if (DebugLevel >= 2) |
425 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); | 425 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 5169f65..cc65981 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
160 | lock (responses) | 160 | lock (responses) |
161 | return responses.ContainsKey(x); | 161 | return responses.ContainsKey(x); |
162 | }; | 162 | }; |
163 | GetEvents = (x, y, s) => | 163 | GetEvents = (x, y) => |
164 | { | 164 | { |
165 | lock (responses) | 165 | lock (responses) |
166 | { | 166 | { |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 0f305b1..0caeddf 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
150 | base(null, null, null, null, pId, int.MaxValue) | 150 | base(null, null, null, null, pId, int.MaxValue) |
151 | { | 151 | { |
152 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | 152 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; |
153 | GetEvents = (x, y, s) => | 153 | GetEvents = (x, y) => |
154 | { | 154 | { |
155 | lock (responses) | 155 | lock (responses) |
156 | { | 156 | { |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 13762f7..56221aa 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
444 | } | 444 | } |
445 | } | 445 | } |
446 | } | 446 | } |
447 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 447 | private Hashtable GetEvents(UUID requestID, UUID sessionID) |
448 | { | 448 | { |
449 | UrlData url = null; | 449 | UrlData url = null; |
450 | RequestData requestData = null; | 450 | RequestData requestData = null; |