From bbc1dc6bceb18cc1970109c5069724fba84e9c83 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 May 2014 22:37:07 +0100
Subject: Replace existing 0 timeout in internal overloaded
 SynchronousRestObjectRequester.MakeRequest() methods with proper
 Timeout.Infinite (-1) instead.

Triggered by recent faf9ba53 though this was wrong in the code before, it's just that we didn't actually try to set the timeout given.
---
 OpenSim/Framework/WebUtil.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 37ecd46..3b73520 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -36,6 +36,7 @@ using System.Net;
 using System.Net.Security;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Web;
 using System.Xml;
 using System.Xml.Serialization;
@@ -1091,7 +1092,7 @@ namespace OpenSim.Framework
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
         {
-            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
+            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, Timeout.Infinite);
         }
 
         /// <summary>
@@ -1100,7 +1101,7 @@ namespace OpenSim.Framework
         /// <param name="verb"></param>
         /// <param name="requestUrl"></param>
         /// <param name="obj"></param>
-        /// <param name="pTimeout">Request timeout in milliseconds.</param>
+        /// <param name="pTimeout">Request timeout in milliseconds.  Timeout.Infinite indicates no timeout.</param>
         /// <returns>
         /// The response.  If there was an internal exception or the request timed out, 
         /// then the default(TResponse) is returned.
@@ -1116,7 +1117,7 @@ namespace OpenSim.Framework
         /// <param name="verb"></param>
         /// <param name="requestUrl"></param>
         /// <param name="obj"></param>
-        /// <param name="pTimeout">Request timeout in milliseconds.</param>
+        /// <param name="pTimeout">Request timeout in milliseconds.  Timeout.Infinite indicates no timeout.</param>
         /// <param name="maxConnections"></param>
         /// <returns>
         /// The response.  If there was an internal exception or the request timed out, 
-- 
cgit v1.1