Merge default into bug 21949

Author: tonyg

projects/client/RabbitMQ.Client/src/client/api/IConnection.cs

@@ -120,6 +120,11 @@ public interface IConnection: IDisposable
         ///server.</summary>
         IDictionary ClientProperties { get; }
 
+        ///<summary>A dictionary of the server properties sent by the server
+        ///while establishing the connection. This typically includes
+        ///the product name and version of the server.</summary>
+        IDictionary ServerProperties { get; }
+
         ///<summary>Returns the known hosts that came back from the
         ///broker in the connection.open-ok method at connection
         ///startup time. Null until the connection is completely open

projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

@@ -94,6 +94,7 @@ public abstract class ConnectionBase : IConnection
         public uint m_frameMax = 0;
         public ushort m_heartbeat = 0;
         public IDictionary m_clientProperties;
+        public IDictionary m_serverProperties;
         public AmqpTcpEndpoint[] m_knownHosts = null;
 
         public MainSession m_session0;
@@ -263,6 +264,18 @@ public IDictionary ClientProperties
             }
         }
 
+        public IDictionary ServerProperties
+        {
+            get
+            {
+                return m_serverProperties;
+            }
+            set
+            {
+                m_serverProperties = value;
+            }
+        }
+
         public AmqpTcpEndpoint[] KnownHosts
         {
             get { return m_knownHosts; }
@@ -961,6 +974,8 @@ public void Open(bool insist)
             ConnectionStartDetails connectionStart = (ConnectionStartDetails)
                 connectionStartCell.Value;
 
+            ServerProperties = connectionStart.m_serverProperties;
+
             AmqpVersion serverVersion = new AmqpVersion(connectionStart.m_versionMajor,
                                                         connectionStart.m_versionMinor);
             if (!serverVersion.Equals(Protocol.Version))