Merge bug26016 into stable

Author: Tim Watson

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/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)
                 {