aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WebUtil.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
-rw-r--r--OpenSim/Framework/WebUtil.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 18e50a2..4d486e6 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Framework
306 /// </summary> 306 /// </summary>
307 public static OSDMap PostToService(string url, NameValueCollection data) 307 public static OSDMap PostToService(string url, NameValueCollection data)
308 { 308 {
309 return ServiceFormRequest(url,data,10000); 309 return ServiceFormRequest(url,data, 20000);
310 } 310 }
311 311
312 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) 312 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -925,11 +925,18 @@ namespace OpenSim.Framework
925 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception> 925 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception>
926 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj) 926 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
927 { 927 {
928 return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
929 }
930
931 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
932 {
928 Type type = typeof(TRequest); 933 Type type = typeof(TRequest);
929 TResponse deserial = default(TResponse); 934 TResponse deserial = default(TResponse);
930 935
931 WebRequest request = WebRequest.Create(requestUrl); 936 WebRequest request = WebRequest.Create(requestUrl);
932 request.Method = verb; 937 request.Method = verb;
938 if (pTimeout != 0)
939 request.Timeout = pTimeout * 1000;
933 940
934 if ((verb == "POST") || (verb == "PUT")) 941 if ((verb == "POST") || (verb == "PUT"))
935 { 942 {