3 files changed, 31 insertions, 17 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index d8cbeac..41fb376 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -59,6 +59,8 @@ using System.IO;
 using System.Text;
 using HttpServer;
 using OpenMetaverse;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -66,6 +68,10 @@ namespace OpenSim.Framework.Servers.HttpServer
     
     public class PollServiceWorkerThread
     {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
         public event ReQueuePollServiceItem ReQueue;
 
         private readonly BaseHttpServer m_server;
@@ -92,31 +98,36 @@ namespace OpenSim.Framework.Servers.HttpServer
             while (m_running)
             {
                 PollServiceHttpRequest req = m_request.Dequeue();
-                if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
+                try
                 {
-                    StreamReader str = new StreamReader(req.Request.Body);
-
-                    Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
-                    m_server.DoHTTPGruntWork(responsedata,
-                                             new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
-                }
-                else
-                {
-                    if ((Environment.TickCount - req.RequestTime) > m_timeout)
+                    if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
                     {
-                        m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                        StreamReader str = new StreamReader(req.Request.Body);
+
+                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
+                        m_server.DoHTTPGruntWork(responsedata,
                                                  new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                     }
                     else
                     {
-                        ReQueuePollServiceItem reQueueItem = ReQueue;
-                        if (reQueueItem != null)
-                            reQueueItem(req);
+                        if ((Environment.TickCount - req.RequestTime) > m_timeout)
+                        {
+                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                                                     new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
+                        }
+                        else
+                        {
+                            ReQueuePollServiceItem reQueueItem = ReQueue;
+                            if (reQueueItem != null)
+                                reQueueItem(req);
+                        }
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                }
             }
-
-
         }
 
         internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest)
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index ec2f9ec..2ef4a36 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
             request.ContentType = "text/xml";
+            request.Timeout = 20000;
 
             MemoryStream buffer = new MemoryStream();
 
@@ -98,7 +99,9 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
                 deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+                resp.Close();
             }
+            requestStream.Close();
             return deserial;
         }
     }
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index 09ef95b..ec9bd4f 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
 
-            if (verb == "POST")
+            if ((verb == "POST") || (verb == "PUT"))
             {
                 request.ContentType = "text/xml";