Merge branch 'release' into dev

src/Microsoft.AspNet.SignalR.Client/Connection.cs

@@ -42,6 +42,9 @@ public class Connection : IConnection, IDisposable
         // The amount of time the client should attempt to reconnect before stopping.
         private TimeSpan _disconnectTimeout;
 
+        // The amount of time a transport will wait (while connecting) before failing. 
+        private TimeSpan _totalTransportConnectTimeout;
+
         // Provides a way to cancel the the timeout that stops a reconnect cycle
         private IDisposable _disconnectTimeoutOperation;
 
@@ -176,6 +179,7 @@ public Connection(string url, string queryString)
             TraceWriter = new DebugTextWriter();
             Headers = new HeaderDictionary(this);
             TransportConnectTimeout = TimeSpan.Zero;
+            _totalTransportConnectTimeout = TimeSpan.Zero;
 
             // Current client protocol
             Protocol = new Version(1, 3);
@@ -187,6 +191,18 @@ public Connection(string url, string queryString)
         /// </summary>
         public TimeSpan TransportConnectTimeout { get; set; }
 
+        /// <summary>
+        /// The amount of time a transport will wait (while connecting) before failing.
+        /// This is the total vaue obtained by adding the server's configuration value and the timeout specified by the user
+        /// </summary>
+        TimeSpan IConnection.TotalTransportConnectTimeout
+        {
+            get
+            {
+                return _totalTransportConnectTimeout;
+            }
+        }
+
         public Version Protocol { get; set; }
 
         /// <summary>
@@ -446,7 +462,7 @@ private Task Negotiate(IClientTransport transport)
                                 ConnectionId = negotiationResponse.ConnectionId;
                                 ConnectionToken = negotiationResponse.ConnectionToken;
                                 _disconnectTimeout = TimeSpan.FromSeconds(negotiationResponse.DisconnectTimeout);
-                                TransportConnectTimeout = TransportConnectTimeout + TimeSpan.FromSeconds(negotiationResponse.TransportConnectTimeout);
+                                _totalTransportConnectTimeout = TransportConnectTimeout + TimeSpan.FromSeconds(negotiationResponse.TransportConnectTimeout);
 
                                 // Default the beat interval to be 5 seconds in case keep alive is disabled.
                                 var beatInterval = TimeSpan.FromSeconds(5);

src/Microsoft.AspNet.SignalR.Client/IConnection.cs

@@ -21,6 +21,7 @@ public interface IConnection
     {
         Version Protocol { get; set; }
         TimeSpan TransportConnectTimeout { get; set; }
+        TimeSpan TotalTransportConnectTimeout { get; }
         TimeSpan ReconnectWindow { get; set; }
         KeepAliveData KeepAliveData { get; set; }
         string MessageId { get; set; }

src/Microsoft.AspNet.SignalR.Client/Transports/HttpBasedTransport.cs

@@ -66,7 +66,7 @@ public Task Start(IConnection connection, string connectionData, CancellationTok
                 throw new ArgumentNullException("connection");
             }
 
-            var initializeHandler = new TransportInitializationHandler(connection.TransportConnectTimeout, disconnectToken);
+            var initializeHandler = new TransportInitializationHandler(connection.TotalTransportConnectTimeout, disconnectToken);
 
             OnStart(connection, connectionData, disconnectToken, initializeHandler);
 

src/Microsoft.AspNet.SignalR.Client45/Transports/WebSocketTransport.cs

@@ -75,7 +75,7 @@ public virtual Task Start(IConnection connection, string connectionData, Cancell
                 throw new ArgumentNullException("connection");
             }
 
-            _initializeHandler = new TransportInitializationHandler(connection.TransportConnectTimeout, disconnectToken);
+            _initializeHandler = new TransportInitializationHandler(connection.TotalTransportConnectTimeout, disconnectToken);
 
             // Tie into the OnFailure event so that we can stop the transport silently.
             _initializeHandler.OnFailure += () =>

tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/ConnectionFacts.cs

@@ -231,6 +231,26 @@ public void WebSocketsTransportFailsIfOnConnectedThrows()
             }
         }
 
+        [Fact]
+        public void TransportConnectTimeoutDoesNotAddupOverNegotiateRequests()
+        {
+            using (ITestHost host = CreateHost(HostType.IISExpress))
+            {
+                host.Initialize();
+                var connection = CreateConnection(host, "/signalr");
+                connection.TransportConnectTimeout = TimeSpan.FromSeconds(5);
+
+                using (connection)
+                {
+                    connection.Start().Wait();
+                    var totalTransportConnectTimeout = ((Client.IConnection)connection).TotalTransportConnectTimeout;
+                    connection.Stop();
+                    connection.Start().Wait();
+                    Assert.Equal(((Client.IConnection)connection).TotalTransportConnectTimeout, totalTransportConnectTimeout);
+                }
+            }
+        }
+
         [Theory]
         [InlineData("1337.0", HostType.Memory, TransportType.ServerSentEvents, MessageBusType.Default)]
         [InlineData("1337.0", HostType.Memory, TransportType.ServerSentEvents, MessageBusType.Fake)]