From ecae6838b83942d0c1e3bb694677fd3b7128b7dc Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Tue, 27 Aug 2019 13:53:09 -0700
Subject: [PATCH] Ignore MaxRequestBodySize for upgraded requests (#13477)

---
 src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs | 1 +
 .../IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
index 3cac26f1c6..cab956dd0a 100644
--- a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
@@ -312,6 +312,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
                 throw new InvalidOperationException(CoreStrings.UpgradeCannotBeCalledMultipleTimes);
             }
 
+            MaxRequestBodySize = null;
             _wasUpgraded = true;
 
             StatusCode = StatusCodes.Status101SwitchingProtocols;
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
index b7986cb87b..b0ed64a938 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
@@ -98,6 +98,7 @@ namespace TestSite
 
             // Upgrade the connection
             Stream opaqueTransport = await upgradeFeature.UpgradeAsync();
+            Assert.Null(context.Features.Get<IHttpMaxRequestBodySizeFeature>().MaxRequestBodySize);
 
             // Get the WebSocket object
             var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));