From 67fa6577461bf1e2a39c501f73d8bfc9045ee69e Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 26 Sep 2012 04:52:19 +0100
Subject: keep watchdog happy using it to kill his threads

---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c234537..cc9ddc2 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
             {
-- 
cgit v1.1


From 7e3eba1064197024690c5b3cae4c2cf87319e48c Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 26 Sep 2012 15:41:57 +0100
Subject:  Seems nothing actually need the request body for getevents. so
 change  control flag to false

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')

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
                         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();
-- 
cgit v1.1