From 33186527235091f95a7251ea66a713fdaee1c689 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 21 Aug 2009 11:00:45 -0700
Subject: Added a more sane InventoryServerMoveItemsHandler. Changed
 SynchronousRestObjectRequester so that it also understands PUTs.

---
 OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers/HttpServer')

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


From cfd9cf7b18331a9d2117294f6ba23dd03a9423a1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 25 Aug 2009 06:17:36 -0700
Subject: Closed the web request and stream in
 SynchronousRestSessionObjectPoster -- maybe this is the cause of some
 timeouts seen in some monos?

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

(limited to 'OpenSim/Framework/Servers/HttpServer')

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