From 90da5280af1ade789e6a9d5c71f4d193dac59c33 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 May 2017 09:01:39 +0100 Subject: [PATCH] put back soft http close --- .../Servers/HttpServer/PollServiceRequestManager.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index bd1c040774..c6a3e65154 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs @@ -194,7 +194,6 @@ namespace OpenSim.Framework.Servers.HttpServer qu.Clear(); m_bycontext.Clear(); -/* try { foreach (PollServiceHttpRequest req in m_retryRequests) @@ -207,22 +206,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(); } @@ -232,7 +230,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) {