stable to default

Author: Simon MacMullen

.hgignore

@@ -25,7 +25,7 @@ rabbit\.snk$
 ^\_UpgradeReport\_Files/
 ^gensrc/
 ^projects/.*/.*\.csproj\.user$
-^projects/client/Unit/TestResult\.xml$
+TestResult\.xml$
 
 ^docs/pyle\.log$
 ^build/

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

@@ -87,7 +87,7 @@ private bool CertificateValidationCallback(object sender,
 
         ///<summary>Upgrade a Tcp stream to an Ssl stream using the SSL options
         ///provided</summary>
-        public static Stream TcpUpgrade(Stream tcpStream, SslOption sslOption)
+        public static Stream TcpUpgrade(Stream tcpStream, SslOption sslOption, int timeout)
         {
             SslHelper helper = new SslHelper(sslOption);
             SslStream sslStream = new SslStream(tcpStream, false,
@@ -98,6 +98,8 @@ public static Stream TcpUpgrade(Stream tcpStream, SslOption sslOption)
                                            sslOption.Certs,
                                            sslOption.Version,
                                            false);
+            sslStream.ReadTimeout  = timeout;
+            sslStream.WriteTimeout = timeout;
 
             return sslStream;
         }

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

@@ -75,7 +75,7 @@ public abstract class ModelBase : IFullModel
         public ManualResetEvent m_flowControlBlock = new ManualResetEvent(true);
         private readonly object m_flowSendLock = new object();
 
-        private ulong m_nextPubSeqNo;
+        private ulong m_nextPubSeqNo = 0;
         private SynchronizedCollection<ulong> m_unconfirmedSet =
             new SynchronizedCollection<ulong>();
         private bool m_onlyAcksReceived = true;
@@ -970,7 +970,10 @@ public abstract uint _Private_QueueDelete(string queue,
 
         public void ConfirmSelect()
         {
-            m_nextPubSeqNo = 1;
+            if (m_nextPubSeqNo == 0UL)
+            {
+                m_nextPubSeqNo = 1;
+            }
             _Private_ConfirmSelect(false);
         }
 

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

@@ -92,7 +92,7 @@ public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint,
             {
                 try
                 {
-                    netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl);
+                    netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl, timeout);
                 }
                 catch (Exception)
                 {

projects/client/Unit/src/unit/TestConfirmSelect.cs

@@ -0,0 +1,75 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 1.1.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (C) 2007-2013 GoPivotal, Inc.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v1.1:
+//
+//---------------------------------------------------------------------------
+//  The contents of this file are subject to the Mozilla Public License
+//  Version 1.1 (the "License"); you may not use this file except in
+//  compliance with the License. You may obtain a copy of the License
+//  at http://www.mozilla.org/MPL/
+//
+//  Software distributed under the License is distributed on an "AS IS"
+//  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+//  the License for the specific language governing rights and
+//  limitations under the License.
+//
+//  The Original Code is RabbitMQ.
+//
+//  The Initial Developer of the Original Code is GoPivotal, Inc.
+//  Copyright (c) 2007-2013 GoPivotal, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using NUnit.Framework;
+
+using System;
+using System.Text;
+
+namespace RabbitMQ.Client.Unit {
+    [TestFixture]
+    public class TestConfirmSelect : IntegrationFixture {
+        protected UTF8Encoding enc = new UTF8Encoding();
+
+        [Test]
+        public void TestConfirmSelectIdempotency()
+        {
+            Model.ConfirmSelect();
+            Assert.AreEqual(1, Model.NextPublishSeqNo);
+            Publish();
+            Assert.AreEqual(2, Model.NextPublishSeqNo);
+            Publish();
+            Assert.AreEqual(3, Model.NextPublishSeqNo);
+
+            Model.ConfirmSelect();
+            Publish();
+            Assert.AreEqual(4, Model.NextPublishSeqNo);
+            Publish();
+            Assert.AreEqual(5, Model.NextPublishSeqNo);
+            Publish();
+            Assert.AreEqual(6, Model.NextPublishSeqNo);
+        }
+
+        protected void Publish()
+        {
+            Model.BasicPublish("", "amq.fanout", null, enc.GetBytes("message"));
+        }
+    }
+}