aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-12 22:37:07 +0100
committerJustin Clark-Casey (justincc)2014-05-12 22:37:07 +0100
commitbbc1dc6bceb18cc1970109c5069724fba84e9c83 (patch)
tree2ac656db41f65f71f8fc61c8168b38a5b8711c1b /OpenSim
parentEliminate subsequently unused scene finding in UndeliveredMessage() method of... (diff)
downloadopensim-SC_OLD-bbc1dc6bceb18cc1970109c5069724fba84e9c83.zip
opensim-SC_OLD-bbc1dc6bceb18cc1970109c5069724fba84e9c83.tar.gz
opensim-SC_OLD-bbc1dc6bceb18cc1970109c5069724fba84e9c83.tar.bz2
opensim-SC_OLD-bbc1dc6bceb18cc1970109c5069724fba84e9c83.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/WebUtil.cs7
1 files changed, 4 insertions, 3 deletions
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;
36using System.Net.Security; 36using System.Net.Security;
37using System.Reflection; 37using System.Reflection;
38using System.Text; 38using System.Text;
39using System.Threading;
39using System.Web; 40using System.Web;
40using System.Xml; 41using System.Xml;
41using System.Xml.Serialization; 42using System.Xml.Serialization;
@@ -1091,7 +1092,7 @@ namespace OpenSim.Framework
1091 /// </returns> 1092 /// </returns>
1092 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj) 1093 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
1093 { 1094 {
1094 return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0); 1095 return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, Timeout.Infinite);
1095 } 1096 }
1096 1097
1097 /// <summary> 1098 /// <summary>
@@ -1100,7 +1101,7 @@ namespace OpenSim.Framework
1100 /// <param name="verb"></param> 1101 /// <param name="verb"></param>
1101 /// <param name="requestUrl"></param> 1102 /// <param name="requestUrl"></param>
1102 /// <param name="obj"></param> 1103 /// <param name="obj"></param>
1103 /// <param name="pTimeout">Request timeout in milliseconds.</param> 1104 /// <param name="pTimeout">Request timeout in milliseconds. Timeout.Infinite indicates no timeout.</param>
1104 /// <returns> 1105 /// <returns>
1105 /// The response. If there was an internal exception or the request timed out, 1106 /// The response. If there was an internal exception or the request timed out,
1106 /// then the default(TResponse) is returned. 1107 /// then the default(TResponse) is returned.
@@ -1116,7 +1117,7 @@ namespace OpenSim.Framework
1116 /// <param name="verb"></param> 1117 /// <param name="verb"></param>
1117 /// <param name="requestUrl"></param> 1118 /// <param name="requestUrl"></param>
1118 /// <param name="obj"></param> 1119 /// <param name="obj"></param>
1119 /// <param name="pTimeout">Request timeout in milliseconds.</param> 1120 /// <param name="pTimeout">Request timeout in milliseconds. Timeout.Infinite indicates no timeout.</param>
1120 /// <param name="maxConnections"></param> 1121 /// <param name="maxConnections"></param>
1121 /// <returns> 1122 /// <returns>
1122 /// The response. If there was an internal exception or the request timed out, 1123 /// The response. If there was an internal exception or the request timed out,