aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-04-30 20:26:48 -0700
committerDiva Canto2011-04-30 20:26:48 -0700
commitcd24fe6331d8451f5efb40fc6650e307d2402d53 (patch)
tree2defca41a39b3c7c67aeba1ecf68a5275a32be67
parentMerge branch '0.7.1-dev' of ssh://opensimulator.org/var/git/opensim into 0.7.... (diff)
downloadopensim-SC_OLD-cd24fe6331d8451f5efb40fc6650e307d2402d53.zip
opensim-SC_OLD-cd24fe6331d8451f5efb40fc6650e307d2402d53.tar.gz
opensim-SC_OLD-cd24fe6331d8451f5efb40fc6650e307d2402d53.tar.bz2
opensim-SC_OLD-cd24fe6331d8451f5efb40fc6650e307d2402d53.tar.xz
Increased the timeouts here too. They were very low.
-rw-r--r--OpenSim/Framework/WebUtil.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 9d70f63..a866e4c 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -142,17 +142,17 @@ namespace OpenSim.Framework
142 /// </summary> 142 /// </summary>
143 public static OSDMap PutToService(string url, OSDMap data) 143 public static OSDMap PutToService(string url, OSDMap data)
144 { 144 {
145 return ServiceOSDRequest(url,data,"PUT",10000); 145 return ServiceOSDRequest(url,data,"PUT",30000);
146 } 146 }
147 147
148 public static OSDMap PostToService(string url, OSDMap data) 148 public static OSDMap PostToService(string url, OSDMap data)
149 { 149 {
150 return ServiceOSDRequest(url,data,"POST",10000); 150 return ServiceOSDRequest(url,data,"POST",30000);
151 } 151 }
152 152
153 public static OSDMap GetFromService(string url) 153 public static OSDMap GetFromService(string url)
154 { 154 {
155 return ServiceOSDRequest(url,null,"GET",10000); 155 return ServiceOSDRequest(url,null,"GET",30000);
156 } 156 }
157 157
158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -171,7 +171,7 @@ namespace OpenSim.Framework
171 request.Timeout = timeout; 171 request.Timeout = timeout;
172 request.KeepAlive = false; 172 request.KeepAlive = false;
173 request.MaximumAutomaticRedirections = 10; 173 request.MaximumAutomaticRedirections = 10;
174 request.ReadWriteTimeout = timeout / 4; 174 request.ReadWriteTimeout = timeout * 4;
175 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 175 request.Headers[OSHeaderRequestID] = reqnum.ToString();
176 176
177 // If there is some input, write it into the request 177 // If there is some input, write it into the request