ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-05-31 07:21:21 +01:00
parent 6a0eba3d7b 7217c20291
commit 55babdc160
26 changed files with 287 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@@ -207,7 +207,6 @@ namespace OpenSim.Framework.Servers.HttpServer
qu.Clear();
m_bycontext.Clear();
/*
try
{
foreach (PollServiceHttpRequest req in m_retryRequests)
@@ -220,22 +219,21 @@ namespace OpenSim.Framework.Servers.HttpServer
}
PollServiceHttpRequest wreq;
*/
m_retryRequests.Clear();
/*
while (m_requests.Count() > 0)
{
try
{
wreq = m_requests.Dequeue(0);
wreq.DoHTTPstop(m_server);
}
catch
{
}
}
*/
m_requests.Clear();
}
@@ -245,7 +243,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
while (m_running)
{
PollServiceHttpRequest req = m_requests.Dequeue(5000);
PollServiceHttpRequest req = m_requests.Dequeue(4500);
Watchdog.UpdateThread();
if(req == null)
continue;