Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

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
                         StreamReader reader = new StreamReader(requestStream, encoding);
 
                         string requestBody = reader.ReadToEnd();
+                        reader.Close();
 
                         Hashtable keysvals = new Hashtable();
                         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
     public delegate void RequestMethod(UUID requestID, Hashtable request);
     public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
-    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
 
     public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
 
@@ -47,13 +47,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         public UUID Id;
         public int TimeOutms;
         public EventType Type;    
-        // must be set true for cases where GetEvents needs to access the request body
-        // at each pool. http can start processing before having the full body
-        // but not sure if this is active for poll events
-        // if original coder thinked its needed i keep it
-        // if the Event has a Request method this seems to smoke for now
-        // seems for now nothing actually uses this so default to false
-        public bool GetEventsNeedsRequestBody = false;
 
         public enum EventType : int
         {
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
                     {
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                         {
-                            string strreq = "";
-                            if (req.PollServiceArgs.GetEventsNeedsRequestBody)
-                            {
-                                try
-                                {
-                                    // should we try to seek back? fear we can't
-                                    str = new StreamReader(req.Request.Body);
-                                    strreq = str.ReadToEnd();
-                                    str.Close();
-                                }
-                                catch
-                                {
-                                    continue;
-                                }
-                            }
-
-                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, strreq);
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
 
                             if (responsedata == null)
                                 continue;