put back soft http close

0.9.0-post-fixes
UbitUmarov 2017-05-30 09:01:39 +01:00
parent e5bebe3a32
commit 90da5280af
1 changed files with 4 additions and 6 deletions

View File

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