diff options
author | UbitUmarov | 2017-05-21 07:02:35 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-21 07:02:35 +0100 |
commit | 0320225ca816dc6dfdd7a90fe80fdbbb8918139b (patch) | |
tree | f7c5d11d87667165a19ede31ac98eaa213e4d3c3 | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-0320225ca816dc6dfdd7a90fe80fdbbb8918139b.zip opensim-SC-0320225ca816dc6dfdd7a90fe80fdbbb8918139b.tar.gz opensim-SC-0320225ca816dc6dfdd7a90fe80fdbbb8918139b.tar.bz2 opensim-SC-0320225ca816dc6dfdd7a90fe80fdbbb8918139b.tar.xz |
reenqueue poll events while conn is open, and not expired
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 4dad44a..cb0c41f 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -277,7 +277,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
277 | try | 277 | try |
278 | { | 278 | { |
279 | req.DoHTTPGruntWork(m_server, responsedata); | 279 | req.DoHTTPGruntWork(m_server, responsedata); |
280 | byContextDequeue(req); | 280 | if(req.HttpContext.CanSend() && req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Poll |
281 | && (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) | ||
282 | ReQueueEvent(req); | ||
283 | else | ||
284 | byContextDequeue(req); | ||
281 | } | 285 | } |
282 | catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream | 286 | catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream |
283 | { | 287 | { |