OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure we drop requests if DoHTTPGruntWork fails

0.9.0-post-fixes
UbitUmarov 2017-05-22 05:53:59 +01:00
parent bad00670a9
commit fcb435deb4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@ -244,11 +244,13 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
req.DoHTTPGruntWork(m_server, responsedata); req.DoHTTPGruntWork(m_server, responsedata);
byContextDequeue(req);
} }
catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream catch (ObjectDisposedException)
{ {
// Ignore it, no need to reply }
finally
{
byContextDequeue(req);
} }
return null; return null;
}, null); }, null);
@ -263,12 +265,15 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
req.DoHTTPGruntWork(m_server, req.DoHTTPGruntWork(m_server,
req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id)); req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
byContextDequeue(req);
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
// Ignore it, no need to reply // Ignore it, no need to reply
} }
finally
{
byContextDequeue(req);
}
return null; return null;
}, null); }, null);
} }