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

1 files changed, 24 insertions, 1 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 1e2e2e3..4fd69f3 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -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
             }
         }
     }
-}
\ No newline at end of file
+
+    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;
+        }
+    }
+}