Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/config/Make.rules.Darwin
	cpp/src/Ice/ConnectionFactory.cpp
	cpp/src/Ice/ConnectionI.h

1 files changed, 6 insertions, 1 deletions

diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index 7eeac08f05b..7b47da856cd 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -546,10 +546,15 @@ IceInternal::TcpEndpointI::operator<(const LocalObject& r) const
 Ice::Int
 IceInternal::TcpEndpointI::hashInit() const
 {
-    Ice::Int h = 0;
+    Ice::Int h = 5381;
+    hashAdd(h, TCPEndpointType);
     hashAdd(h, _host);
     hashAdd(h, _port);
     hashAdd(h, _timeout);
+    hashAdd(h, _protocol.major);
+    hashAdd(h, _protocol.minor);
+    hashAdd(h, _encoding.major);
+    hashAdd(h, _encoding.minor);
     hashAdd(h, _connectionId);
     hashAdd(h, _compress);
     return h;