reenqueue poll events while conn is open, and not expired

2017-05-21 07:02:35 +01:00 · 2017-05-21 07:02:35 +01:00 · 0320225ca8
parent e520dba717
commit 0320225ca8
1 changed files with 5 additions and 1 deletions
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@ -277,7 +277,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                            try
                            {
                                req.DoHTTPGruntWork(m_server, responsedata);
-                                byContextDequeue(req);
+                                if(req.HttpContext.CanSend() && req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Poll
+                                        && (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                                    ReQueueEvent(req);
+                                else
+                                    byContextDequeue(req);
                            }
                            catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
                            {