Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -101,20 +101,13 @@ namespace System.ServiceModel.Activation
}
}
// Provides the version of the WebSocket protocol supported by IIS. Throws an exception if called before we determined the value.
// Provides the version of the WebSocket protocol supported by IIS.
// Returns null if WebSockets are not supported (because the IIS WebSocketModule is not installed or enabled).
public override string WebSocketVersion
{
get
{
if (isWebSocketVersionSet)
{
return webSocketVersion;
}
else
{
throw Fx.AssertAndFailFast("The supported WebSocket protocol version is not determined at this time.");
}
return isWebSocketVersionSet ? webSocketVersion : null;
}
}
@ -136,8 +129,6 @@ namespace System.ServiceModel.Activation
/// </remarks>
public static void TrySetWebSocketVersion(HttpApplication application)
{
Fx.Assert(application != null, "Invalid argument.");
if (!isWebSocketVersionSet)
{
webSocketVersion = application.Request.ServerVariables[WebSocketVersionServerProperty];