Set up stream timeouts as early as possible

The patch by Jonathan Oliver.

Author: michaelklishin

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, int timeout)
+        public static Stream TcpUpgrade(Stream tcpStream, SslOption sslOption)
         {
             SslHelper helper = new SslHelper(sslOption);
 
@@ -104,8 +104,6 @@ public static Stream TcpUpgrade(Stream tcpStream, SslOption sslOption, int timeo
                                            sslOption.Certs,
                                            sslOption.Version,
                                            false);
-            sslStream.ReadTimeout  = timeout;
-            sslStream.WriteTimeout = timeout;
 
             return sslStream;
         }

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

@@ -94,11 +94,14 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint,
             }
 
             Stream netstream = m_socket.GetStream();
+            netstream.ReadTimeout = timeout;
+            netstream.WriteTimeout = timeout;
+            
             if (endpoint.Ssl.Enabled)
             {
                 try
                 {
-                    netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl, timeout);
+                    netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl);
                 }
                 catch (Exception)
                 {