Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv

2 files changed, 4 insertions, 1 deletions

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";