aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-12 19:20:00 +0100
committerJustin Clark-Casey (justincc)2014-05-12 19:20:00 +0100
commitfaf9ba53fc10d8abcc9e58e98cc887c1f0f49696 (patch)
treebb169214d89301a317a5fe3113b3481b85e3691a /OpenSim/Framework
parentFixed error if a user didn't have a "Current Outfit" folder in their suitcase. (diff)
downloadopensim-SC_OLD-faf9ba53fc10d8abcc9e58e98cc887c1f0f49696.zip
opensim-SC_OLD-faf9ba53fc10d8abcc9e58e98cc887c1f0f49696.tar.gz
opensim-SC_OLD-faf9ba53fc10d8abcc9e58e98cc887c1f0f49696.tar.bz2
opensim-SC_OLD-faf9ba53fc10d8abcc9e58e98cc887c1f0f49696.tar.xz
In SynchronousRestObjectRequester.MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections) actually set timeout on WebRequest if given.
Previously, we were doing nothing with this parameter. No effect on current code since none of the 6 callers attempt to use the timeout.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 70fab77..2a309a7 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1116,6 +1116,8 @@ namespace OpenSim.Framework
1116 1116
1117 WebRequest request = WebRequest.Create(requestUrl); 1117 WebRequest request = WebRequest.Create(requestUrl);
1118 HttpWebRequest ht = (HttpWebRequest)request; 1118 HttpWebRequest ht = (HttpWebRequest)request;
1119 ht.Timeout = pTimeout;
1120
1119 if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections) 1121 if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections)
1120 ht.ServicePoint.ConnectionLimit = maxConnections; 1122 ht.ServicePoint.ConnectionLimit = maxConnections;
1121 1123