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 4734fc1..e77b88b 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -279,7 +279,7 @@ namespace OpenSim.Framework
279 /// </summary> 279 /// </summary>
280 public static OSDMap PostToService(string url, NameValueCollection data) 280 public static OSDMap PostToService(string url, NameValueCollection data)
281 { 281 {
282 return ServiceFormRequest(url,data,10000); 282 return ServiceFormRequest(url,data, 20000);
283 } 283 }
284 284
285 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) 285 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -898,11 +898,18 @@ namespace OpenSim.Framework
898 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception> 898 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception>
899 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj) 899 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
900 { 900 {
901 return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
902 }
903
904 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
905 {
901 Type type = typeof(TRequest); 906 Type type = typeof(TRequest);
902 TResponse deserial = default(TResponse); 907 TResponse deserial = default(TResponse);
903 908
904 WebRequest request = WebRequest.Create(requestUrl); 909 WebRequest request = WebRequest.Create(requestUrl);
905 request.Method = verb; 910 request.Method = verb;
911 if (pTimeout != 0)
912 request.Timeout = pTimeout * 1000;
906 913
907 if ((verb == "POST") || (verb == "PUT")) 914 if ((verb == "POST") || (verb == "PUT"))
908 { 915 {