Permalink
Browse files

Fixed missed rebase pieces

  • Loading branch information...
1 parent 568e683 commit 89d40512a3ec319d0c9c3545486ef20202475b42 @NTaylorMullen NTaylorMullen committed Jun 25, 2013
@@ -512,8 +512,7 @@ protected virtual void BuildNegotiateResponse(HostContext context, Dictionary<st
response["ConnectionId"] = connectionId;
response["KeepAliveTimeout"] = keepAliveTimeout != null ? keepAliveTimeout.Value.TotalSeconds : (double?)null;
response["DisconnectTimeout"] = _configurationManager.DisconnectTimeout.TotalSeconds;
- response["TryWebSockets"] = _transportManager.SupportsTransport(WebSocketsTransportName) && context.SupportsWebSockets();
- response["WebSocketServerUrl"] = context.WebSocketServerUrl();
+ response["TryWebSockets"] = _transportManager.SupportsTransport(WebSocketsTransportName) && context.Environment.SupportsWebSockets();
response["ProtocolVersion"] = _protocolResolver.Resolve(context.Request).ToString();
response["TransportConnectTimeout"] = _configurationManager.TransportConnectTimeout.TotalSeconds;
}
@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Threading.Tasks;
using Microsoft.AspNet.SignalR.Client;
-using Microsoft.AspNet.SignalR.FunctionalTests.Infrastructure;
-using Microsoft.AspNet.SignalR.Hosting;
+using Microsoft.AspNet.SignalR.Client.Http;
using Microsoft.AspNet.SignalR.Hosting.Memory;
using Microsoft.AspNet.SignalR.Hubs;
-using Microsoft.AspNet.SignalR.Client.Http;
+using Microsoft.AspNet.SignalR.Tests.Common.Infrastructure;
using Newtonsoft.Json;
using Owin;
using Xunit;
@@ -45,11 +43,11 @@ public void BuildNegotiateCanAddValuesToNegotiate()
Assert.NotNull(raw.Foo);
Assert.Equal(raw.Foo, valueForKey);
});
-
+
}).Wait();
}
}
-
+
private class AddOrModifyNegotiateProperty : HubPipelineModule
{
private string _key;
@@ -70,7 +68,7 @@ public AddOrModifyNegotiateProperty(string key, object valueForKey)
};
}
}
-
+
private class CustomNegotiationResponse : NegotiationResponse
{
public object Foo { get; set; }

0 comments on commit 89d4051

Please sign in to comment.