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

Merge branch 'master' of opensimulator.org:/var/git/opensim

0.9.1.0-post-fixes
UbitUmarov 2018-09-12 13:24:01 +01:00
parent 714f4387b8 e874e3a2ad
commit cd9327cd8b
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
View File

@ -100,6 +100,13 @@ namespace OpenSim.Framework.Servers.HttpServer
response.Send();
buffer = null;
}
catch (System.Net.Sockets.SocketException ex)
{
// This is "connection reset by peer", meaning the
// requesting server has given up. They need to
// fix their timeouts. We don't want to spam the
// log with this.
}
catch (Exception ex)
{
m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
@ -133,4 +140,20 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
}
}
class PollServiceHttpRequestComparer : IEqualityComparer<PollServiceHttpRequest>
{
public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2)
{
if (b1.contextHash != b2.contextHash)
return false;
bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext);
return b;
}
public int GetHashCode(PollServiceHttpRequest b2)
{
return (int)b2.contextHash;
}
}
}