OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
bullet-2.82
Justin Clark-Casey (justincc) 2014-05-12 22:37:07 +01:00
parent 8457044b2f
commit bbc1dc6bce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/WebUtil.cs
View File

@ -36,6 +36,7 @@ using System.Net;
using System.Net.Security; using System.Net.Security;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading;
using System.Web; using System.Web;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
@ -1091,7 +1092,7 @@ namespace OpenSim.Framework
/// </returns> /// </returns>
public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj) 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> /// <summary>
@ -1100,7 +1101,7 @@ namespace OpenSim.Framework
/// <param name="verb"></param> /// <param name="verb"></param>
/// <param name="requestUrl"></param> /// <param name="requestUrl"></param>
/// <param name="obj"></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> /// <returns>
/// The response. If there was an internal exception or the request timed out, /// The response. If there was an internal exception or the request timed out,
/// then the default(TResponse) is returned. /// then the default(TResponse) is returned.
@ -1116,7 +1117,7 @@ namespace OpenSim.Framework
/// <param name="verb"></param> /// <param name="verb"></param>
/// <param name="requestUrl"></param> /// <param name="requestUrl"></param>
/// <param name="obj"></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> /// <param name="maxConnections"></param>
/// <returns> /// <returns>
/// The response. If there was an internal exception or the request timed out, /// The response. If there was an internal exception or the request timed out,