diff options
author | UbitUmarov | 2015-09-03 18:39:08 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-03 18:39:08 +0100 |
commit | cdaed113872f0615a0d2864cc54064a4432054c6 (patch) | |
tree | 246e62dfeffac632cdcd9738a77faebd30b3bd6c /OpenSim/Framework/WebUtil.cs | |
parent | seems to compile ( tests comented out) (diff) | |
download | opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.zip opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.gz opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.bz2 opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.xz |
at last we can login and see objects ( friends is dead and disable in
scenepresence)
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 44d9318..f834baa 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Framework | |||
86 | /// Number of milliseconds a call can take before it is considered | 86 | /// Number of milliseconds a call can take before it is considered |
87 | /// a "long" call for warning & debugging purposes | 87 | /// a "long" call for warning & debugging purposes |
88 | /// </summary> | 88 | /// </summary> |
89 | public const int LongCallTime = 500; | 89 | public const int LongCallTime = 3000; |
90 | 90 | ||
91 | /// <summary> | 91 | /// <summary> |
92 | /// The maximum length of any data logged because of a long request time. | 92 | /// The maximum length of any data logged because of a long request time. |
@@ -418,7 +418,7 @@ namespace OpenSim.Framework | |||
418 | /// </summary> | 418 | /// </summary> |
419 | public static OSDMap PostToService(string url, NameValueCollection data) | 419 | public static OSDMap PostToService(string url, NameValueCollection data) |
420 | { | 420 | { |
421 | return ServiceFormRequest(url,data, 20000); | 421 | return ServiceFormRequest(url,data, 30000); |
422 | } | 422 | } |
423 | 423 | ||
424 | public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) | 424 | public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) |
@@ -808,7 +808,7 @@ namespace OpenSim.Framework | |||
808 | /// <param name="requestUrl"></param> | 808 | /// <param name="requestUrl"></param> |
809 | /// <param name="obj"></param> | 809 | /// <param name="obj"></param> |
810 | /// <param name="pTimeout"> | 810 | /// <param name="pTimeout"> |
811 | /// Request timeout in milliseconds. Timeout.Infinite indicates no timeout. If 0 is passed then the default HttpWebRequest timeout is used (100 seconds) | 811 | /// Request timeout in seconds. Timeout.Infinite indicates no timeout. If 0 is passed then the default HttpWebRequest timeout is used (100 seconds) |
812 | /// </param> | 812 | /// </param> |
813 | /// <param name="maxConnections"></param> | 813 | /// <param name="maxConnections"></param> |
814 | /// <returns> | 814 | /// <returns> |
@@ -877,7 +877,7 @@ namespace OpenSim.Framework | |||
877 | requestStream.Write(data, 0, length); | 877 | requestStream.Write(data, 0, length); |
878 | 878 | ||
879 | // capture how much time was spent writing | 879 | // capture how much time was spent writing |
880 | // tickdata = Util.EnvironmentTickCountSubtract(tickstart); | 880 | tickdata = Util.EnvironmentTickCountSubtract(tickstart); |
881 | 881 | ||
882 | request.BeginGetResponse(delegate(IAsyncResult ar) | 882 | request.BeginGetResponse(delegate(IAsyncResult ar) |
883 | { | 883 | { |
@@ -992,9 +992,9 @@ namespace OpenSim.Framework | |||
992 | } | 992 | } |
993 | else if (WebUtil.DebugLevel >= 4) | 993 | else if (WebUtil.DebugLevel >= 4) |
994 | { | 994 | { |
995 | m_log.DebugFormat( | 995 | m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} took {1}ms, {2}ms writing", |
996 | "[WEB UTIL]: HTTP OUT {0} took {1}ms", | 996 | |
997 | reqnum, tickdiff); | 997 | reqnum, tickdiff, tickdata); |
998 | } | 998 | } |
999 | } | 999 | } |
1000 | finally | 1000 | finally |
@@ -1054,8 +1054,6 @@ namespace OpenSim.Framework | |||
1054 | { | 1054 | { |
1055 | writer.Write(obj); | 1055 | writer.Write(obj); |
1056 | writer.Flush(); | 1056 | writer.Flush(); |
1057 | if (WebUtil.DebugLevel >= 5) | ||
1058 | WebUtil.LogOutgoingDetail(buffer); | ||
1059 | } | 1057 | } |
1060 | 1058 | ||
1061 | length = (int)obj.Length; | 1059 | length = (int)obj.Length; |
@@ -1248,7 +1246,7 @@ namespace OpenSim.Framework | |||
1248 | auth.AddAuthorization(ht.Headers); | 1246 | auth.AddAuthorization(ht.Headers); |
1249 | 1247 | ||
1250 | if (pTimeout != 0) | 1248 | if (pTimeout != 0) |
1251 | ht.Timeout = pTimeout; | 1249 | request.Timeout = pTimeout * 1000; |
1252 | 1250 | ||
1253 | if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections) | 1251 | if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections) |
1254 | ht.ServicePoint.ConnectionLimit = maxConnections; | 1252 | ht.ServicePoint.ConnectionLimit = maxConnections; |