Merged bug23013 into default

Author: Emile Joubert

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

@@ -74,6 +74,7 @@ namespace RabbitMQ.Client
     public class AmqpTcpEndpoint
     {
         ///<summary>Indicates that the default port for the protocol should be used</summary>
+        public const int DefaultAmqpSslPort = 5671;
         public const int UseDefaultPort = -1;
 
         private IProtocol m_protocol;
@@ -98,7 +99,13 @@ public string HostName
         ///port number for the IProtocol to be used.</summary>
         public int Port
         {
-            get { return (m_port == UseDefaultPort) ? m_protocol.DefaultPort : m_port; }
+            get {
+                if (m_port != UseDefaultPort)
+                    return m_port;
+                if (m_ssl.Enabled)
+                    return DefaultAmqpSslPort;
+                return m_protocol.DefaultPort;
+            }
             set { m_port = value; }
         }
 

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

@@ -165,13 +165,14 @@ public AmqpTcpEndpoint Endpoint
         { 
           get
           { 
-              return new AmqpTcpEndpoint(Protocol, HostName, Port); 
+              return new AmqpTcpEndpoint(Protocol, HostName, Port, Ssl); 
           }
           set
           {
               Protocol = value.Protocol;
               Port = value.Port;
               HostName = value.HostName;
+              Ssl = value.Ssl;
           }
         }