huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename IHttpOpaqueUpgradeFeature to IHttpUpgradeFeature.

This commit is contained in:
Chris Ross 2014-07-03 14:03:57 -07:00
parent fe0e5be913
commit 112e3e5358
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Server.WebListener
IHttpRequestLifetimeFeature, IHttpRequestLifetimeFeature,
IHttpWebSocketFeature, IHttpWebSocketFeature,
IHttpAuthenticationFeature, IHttpAuthenticationFeature,
IHttpOpaqueUpgradeFeature IHttpUpgradeFeature
{ {
private RequestContext _requestContext; private RequestContext _requestContext;
private FeatureCollection _features; private FeatureCollection _features;
@ -106,7 +106,7 @@ namespace Microsoft.AspNet.Server.WebListener
// Win8+ // Win8+
if (WebSocketHelpers.AreWebSocketsSupported) if (WebSocketHelpers.AreWebSocketsSupported)
{ {
_features.Add(typeof(IHttpOpaqueUpgradeFeature), this); _features.Add(typeof(IHttpUpgradeFeature), this);
_features.Add(typeof(IHttpWebSocketFeature), this); _features.Add(typeof(IHttpWebSocketFeature), this);
} }
@ -380,12 +380,12 @@ namespace Microsoft.AspNet.Server.WebListener
_requestContext.Abort(); _requestContext.Abort();
} }
bool IHttpOpaqueUpgradeFeature.IsUpgradableRequest bool IHttpUpgradeFeature.IsUpgradableRequest
{ {
get { return _requestContext.IsUpgradableRequest; } get { return _requestContext.IsUpgradableRequest; }
} }
Task<Stream> IHttpOpaqueUpgradeFeature.UpgradeAsync() Task<Stream> IHttpUpgradeFeature.UpgradeAsync()
{ {
return _requestContext.UpgradeAsync(); return _requestContext.UpgradeAsync();
} }

10
test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Server.WebListener
var httpContext = new DefaultHttpContext((IFeatureCollection)env); var httpContext = new DefaultHttpContext((IFeatureCollection)env);
try try
{ {
var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>(); var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
Assert.NotNull(opaqueFeature); Assert.NotNull(opaqueFeature);
} }
catch (Exception ex) catch (Exception ex)
@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Server.WebListener
await httpContext.Response.WriteAsync("Hello World"); await httpContext.Response.WriteAsync("Hello World");
try try
{ {
var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>(); var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
Assert.NotNull(opaqueFeature); Assert.NotNull(opaqueFeature);
await opaqueFeature.UpgradeAsync(); await opaqueFeature.UpgradeAsync();
upgradeThrew = false; upgradeThrew = false;
@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Server.WebListener
{ {
var httpContext = new DefaultHttpContext((IFeatureCollection)env); var httpContext = new DefaultHttpContext((IFeatureCollection)env);
httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets
var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>(); var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
Assert.NotNull(opaqueFeature); Assert.NotNull(opaqueFeature);
Assert.True(opaqueFeature.IsUpgradableRequest); Assert.True(opaqueFeature.IsUpgradableRequest);
await opaqueFeature.UpgradeAsync(); await opaqueFeature.UpgradeAsync();
@ -145,7 +145,7 @@ namespace Microsoft.AspNet.Server.WebListener
try try
{ {
httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets
var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>(); var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
Assert.NotNull(opaqueFeature); Assert.NotNull(opaqueFeature);
Assert.True(opaqueFeature.IsUpgradableRequest); Assert.True(opaqueFeature.IsUpgradableRequest);
var opaqueStream = await opaqueFeature.UpgradeAsync(); var opaqueStream = await opaqueFeature.UpgradeAsync();
@ -186,7 +186,7 @@ namespace Microsoft.AspNet.Server.WebListener
var httpContext = new DefaultHttpContext((IFeatureCollection)env); var httpContext = new DefaultHttpContext((IFeatureCollection)env);
try try
{ {
var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>(); var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
Assert.NotNull(opaqueFeature); Assert.NotNull(opaqueFeature);
Assert.False(opaqueFeature.IsUpgradableRequest); Assert.False(opaqueFeature.IsUpgradableRequest);
} }