From 3d495b709ec897970b24ce48d6a8495d520864d4 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:08:18 -0700
Subject: [PATCH] Implement a timeout value in the
 SynchronousRestObjectRequester. Default is 100 seconds.

---
 .../SynchronousRestObjectRequester.cs           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index eab463cbd8..bb3b8b1620 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -56,6 +56,21 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
+        {
+            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 100);
+        }
+        /// <summary>
+        /// Perform a synchronous REST request.
+        /// </summary>
+        /// <param name="verb"></param>
+        /// <param name="requestUrl"></param>
+        /// <param name="obj"> </param>
+        /// <param name="timeout"> </param>
+        /// <returns></returns>
+        ///
+        /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
+        /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
+        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
         {
             Type type = typeof (TRequest);
             TResponse deserial = default(TResponse);
@@ -81,7 +96,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 int length = (int) buffer.Length;
                 request.ContentLength = length;
-
+                request.Timeout = pTimeout * 1000;
                 Stream requestStream = null;
                 try
                 {