diff options
author | UbitUmarov | 2017-05-30 09:01:39 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-30 09:01:39 +0100 |
commit | 90da5280af1ade789e6a9d5c71f4d193dac59c33 (patch) | |
tree | 5e691c5b762205cec70ed79e2c634e5b6c9c45d5 | |
parent | webrequests serialiazation per endpoint its now ServicePointManager job (diff) | |
download | opensim-SC_OLD-90da5280af1ade789e6a9d5c71f4d193dac59c33.zip opensim-SC_OLD-90da5280af1ade789e6a9d5c71f4d193dac59c33.tar.gz opensim-SC_OLD-90da5280af1ade789e6a9d5c71f4d193dac59c33.tar.bz2 opensim-SC_OLD-90da5280af1ade789e6a9d5c71f4d193dac59c33.tar.xz |
put back soft http close
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index bd1c040..c6a3e65 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -194,7 +194,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
194 | qu.Clear(); | 194 | qu.Clear(); |
195 | m_bycontext.Clear(); | 195 | m_bycontext.Clear(); |
196 | 196 | ||
197 | /* | ||
198 | try | 197 | try |
199 | { | 198 | { |
200 | foreach (PollServiceHttpRequest req in m_retryRequests) | 199 | foreach (PollServiceHttpRequest req in m_retryRequests) |
@@ -207,22 +206,21 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
207 | } | 206 | } |
208 | 207 | ||
209 | PollServiceHttpRequest wreq; | 208 | PollServiceHttpRequest wreq; |
210 | */ | 209 | |
211 | m_retryRequests.Clear(); | 210 | m_retryRequests.Clear(); |
212 | /* | 211 | |
213 | while (m_requests.Count() > 0) | 212 | while (m_requests.Count() > 0) |
214 | { | 213 | { |
215 | try | 214 | try |
216 | { | 215 | { |
217 | wreq = m_requests.Dequeue(0); | 216 | wreq = m_requests.Dequeue(0); |
218 | wreq.DoHTTPstop(m_server); | 217 | wreq.DoHTTPstop(m_server); |
219 | |||
220 | } | 218 | } |
221 | catch | 219 | catch |
222 | { | 220 | { |
223 | } | 221 | } |
224 | } | 222 | } |
225 | */ | 223 | |
226 | m_requests.Clear(); | 224 | m_requests.Clear(); |
227 | } | 225 | } |
228 | 226 | ||
@@ -232,7 +230,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
232 | { | 230 | { |
233 | while (m_running) | 231 | while (m_running) |
234 | { | 232 | { |
235 | PollServiceHttpRequest req = m_requests.Dequeue(5000); | 233 | PollServiceHttpRequest req = m_requests.Dequeue(4500); |
236 | Watchdog.UpdateThread(); | 234 | Watchdog.UpdateThread(); |
237 | if (req != null) | 235 | if (req != null) |
238 | { | 236 | { |