merge in from bug 19356

Author: Matthew Sackman

.hgignore

@@ -4,12 +4,15 @@ syntax: regexp
 ^local\.build$
 ^TestResult.xml$
 ^releases$
+^commit$
+^diff$
 
 ^src/wcf/.*/(bin|obj)$
 ^src/wcf/.*/*.suo$
 
 ^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
 ^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
+
 ^wix/dotnet-client-merge-module\.wxs$
 ^wix/dotnet-client-product\.wxs$
 ^wix/License\.rtf$

configs/dotnet-1.1.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-1.1" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/dotnet-2.0.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-2.0" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/mono-1.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

configs/mono-2.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

default.build

@@ -307,8 +307,25 @@
     <copy file="${nunit.dllname}" todir="${bin.dir}"/>
   </target>
 
+  <target name="detect-ssl">
+    <property name="ssl.avail" value="false"/>
+    <property name="ssl.avail" value="true"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+    <property name="ssl.certs.dir" value="${environment::get-variable('SSL_CERTS_DIR')}"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+  </target>
+
+  <target name="import-ssl" description="import cacert into certmgr" depends="detect-ssl" if="${ssl.avail}">
+    <exec program="${certmgr.exec}">
+      <arg value="-add"/>
+      <arg value="-c"/>
+      <arg value="Trust"/>
+      <arg value="${ssl.certs.dir}/testca/cacert.cer"/>
+    </exec>
+  </target>
+
   <target name="unit" description="run unit tests"
-	      depends="build-unit">
+	      depends="build-unit,import-ssl">
     <exec program="src/unit/nunit/nunit-console.exe" useruntimeengine="true">
       <arg value="${unit-tests.dllname}"/>
     </exec>

src/client/api/AmqpTcpEndpoint.cs

@@ -91,15 +91,35 @@ public int Port
             set { m_port = value; }
         }
 
+
+        private SslOption m_ssl;
+        ///<summary>Retrieve the SSL options for this AmqpTcpEndpoint.
+        ///If not set, null is returned</summary>
+        public SslOption Ssl
+        {
+            get { return m_ssl; }
+            set { m_ssl = value; }
+        }
+
         ///<summary>Construct an AmqpTcpEndpoint with the given
         ///IProtocol, hostname, and port number. If the port number is
         ///-1, the default port number for the IProtocol will be
         ///used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocolVariant, string hostname, int portOrMinusOne)
+        public AmqpTcpEndpoint(IProtocol protocolVariant, string hostname, int portOrMinusOne):
+            this(protocolVariant, hostname, portOrMinusOne, new SslOption())
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, hostname, port number and Ssl option. If the port 
+        ///number is -1, the default port number for the IProtocol 
+        ///will be used.</summary>
+        public AmqpTcpEndpoint(IProtocol protocolVariant, string hostname, int portOrMinusOne, SslOption ssl)
         {
             m_protocol = protocolVariant;
             m_hostName = hostname;
             m_port = portOrMinusOne;
+            m_ssl = ssl;
         }
 
         ///<summary>Returns a URI-like string of the form

src/client/api/ConnectionFactory.cs

@@ -260,7 +260,7 @@ public IConnection CreateConnection(IProtocol version,
                                             int portNumber)
         {
             return CreateConnection(new AmqpTcpEndpoint[] {
-                                        new AmqpTcpEndpoint(version, hostName, portNumber)
+                                        new AmqpTcpEndpoint(version, hostName, portNumber, m_parameters.Ssl)
                                     });
         }
 

src/client/api/ConnectionParameters.cs

@@ -89,6 +89,7 @@ public class ConnectionParameters : ICloneable
         private ushort m_requestedChannelMax = DefaultChannelMax;
         private uint m_requestedFrameMax = DefaultFrameMax;
         private ushort m_requestedHeartbeat = DefaultHeartbeat;
+        private SslOption m_ssl = new SslOption();
 
         ///<summary>Construct a fresh instance, with all fields set to
         ///their respective defaults.</summary>
@@ -136,6 +137,13 @@ public ushort RequestedHeartbeat
             set { m_requestedHeartbeat = value; }
         }
 
+        ///<summary>Ssl options setting</summary>
+        public SslOption Ssl
+        {
+            get { return m_ssl; }
+            set { m_ssl = value; }
+        }
+
         ///<summary>Implement ICloneable.Clone by delegating to our type-safe variant.</summary>
         object ICloneable.Clone()
         {

src/client/api/QueueingBasicConsumer.cs

@@ -76,8 +76,8 @@ namespace RabbitMQ.Client
     /// When the consumer is closed, through BasicCancel or through
     /// the shutdown of the underlying IModel or IConnection, the
     /// SharedQueue's Close() method is called, which causes any
-    /// threads blocked on the queue's Enqueue() or Dequeue()
-    /// operations to throw EndOfStreamException (see the comment for
+    /// Enqueue() operations, and Dequeue() operations when the queue
+    /// is empty, to throw EndOfStreamException (see the comment for
     /// SharedQueue.Close()).
     ///</para>
     ///<para>