From 434a128f1a1ee8ad78bc9eea0bc6c3d5f916dcc5 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 13 Jun 2014 08:37:23 -0700 Subject: [PATCH] Rename AcceptWebSocket to AcceptWebSocketAsync. --- src/Microsoft.AspNet.Http/HttpContext.cs | 4 ++-- src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs | 2 +- test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.Http/HttpContext.cs b/src/Microsoft.AspNet.Http/HttpContext.cs index 7bd166d4da..f14a8b059b 100644 --- a/src/Microsoft.AspNet.Http/HttpContext.cs +++ b/src/Microsoft.AspNet.Http/HttpContext.cs @@ -68,9 +68,9 @@ namespace Microsoft.AspNet.Http public virtual Task AcceptWebSocketAsync() { - return AcceptWebSocket(subProtocol: null); + return AcceptWebSocketAsync(subProtocol: null); } - public abstract Task AcceptWebSocket(string subProtocol); + public abstract Task AcceptWebSocketAsync(string subProtocol); } } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs index 4a8b059972..b8383d05fe 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs @@ -226,7 +226,7 @@ namespace Microsoft.AspNet.PipelineCore return authenticateContext.Results; } - public override Task AcceptWebSocket(string subProtocol) + public override Task AcceptWebSocketAsync(string subProtocol) { var webSocketFeature = WebSocketFeature; if (WebSocketFeature == null) diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs index 87ae8aeb28..44f182db49 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs @@ -129,7 +129,7 @@ namespace Microsoft.AspNet.Owin throw new NotImplementedException(); } - public override Task AcceptWebSocket(string subProtocol) + public override Task AcceptWebSocketAsync(string subProtocol) { throw new NotImplementedException(); }