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

2 files changed, 11 insertions, 12 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
         public RequestMethod Request;
         public UUID Id;
         public int TimeOutms;
-        public EventType Type;
-        public bool GetEventsNeedsRequest = true;
+        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 c234537..c379747 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -278,15 +278,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             Thread.Sleep(1000); // let the world move
 
             foreach (Thread t in m_workerThreads)
-            {
-                try
-                {
-                    t.Abort();
-                }
-                catch
-                {
-                }
-            }
+                    Watchdog.AbortThread(t.ManagedThreadId);
 
             try
             {
@@ -345,10 +337,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                         {
                             string strreq = "";
-                            if (req.PollServiceArgs.GetEventsNeedsRequest)
+                            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();