Feedback

Author: benaadams

src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs

@@ -290,15 +290,15 @@ private void OnOriginFormTarget(HttpMethod method, HttpVersion version, Span<byt
             {
                 // Read raw target before mutating memory.
                 var previousValue = _parsedRawTarget;
-                if (previousValue == null || previousValue.Length != target.Length ||
+                if (DisableStringReuse || previousValue == null || previousValue.Length != target.Length ||
                     !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target))
                 {
                     // The previous string does not match what the bytes would convert to,
                     // so we will need to generate a new string.
                     RawTarget = _parsedRawTarget = target.GetAsciiStringNonNullCharacters();
 
                     previousValue = _parsedQueryString;
-                    if (previousValue == null || previousValue.Length != query.Length ||
+                    if (DisableStringReuse || previousValue == null || previousValue.Length != query.Length ||
                         !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, query))
                     {
                         // The previous string does not match what the bytes would convert to,
@@ -363,7 +363,7 @@ private void OnAuthorityFormTarget(HttpMethod method, Span<byte> target)
             // Allowed characters in the 'host + port' section of authority.
             // See https://tools.ietf.org/html/rfc3986#section-3.2
             var previousValue = _parsedRawTarget;
-            if (previousValue == null || previousValue.Length != target.Length ||
+            if (DisableStringReuse || previousValue == null || previousValue.Length != target.Length ||
                 !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target))
             {
                 // The previous string does not match what the bytes would convert to,
@@ -416,7 +416,7 @@ private void OnAbsoluteFormTarget(Span<byte> target, Span<byte> query)
             //    HTTP/1.1 clients will only send them in requests to proxies.
 
             var previousValue = _parsedRawTarget;
-            if (previousValue == null || previousValue.Length != target.Length ||
+            if (DisableStringReuse || previousValue == null || previousValue.Length != target.Length ||
                 !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target))
             {
                 // The previous string does not match what the bytes would convert to,
@@ -436,13 +436,17 @@ private void OnAbsoluteFormTarget(Span<byte> target, Span<byte> query)
                 Path = _parsedPath = uri.LocalPath;
                 // don't use uri.Query because we need the unescaped version
                 previousValue = _parsedQueryString;
-                if (previousValue == null || previousValue.Length != query.Length ||
+                if (DisableStringReuse || previousValue == null || previousValue.Length != query.Length ||
                     !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, query))
                 {
                     // The previous string does not match what the bytes would convert to,
                     // so we will need to generate a new string.
                     QueryString = _parsedQueryString = query.GetAsciiStringNonNullCharacters();
                 }
+                else
+                {
+                    QueryString = _parsedQueryString;
+                }
             }
             else
             {

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs

@@ -25,8 +25,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
 {
     internal abstract partial class HttpProtocol : IDefaultHttpContextContainer, IHttpResponseControl
     {
-        private const string DisableHeaderReuseSwitch = "Switch.Microsoft.AspNetCore.Kestrel.DisableHeaderReuse";
-        private static readonly bool DisableHeaderReuse = GetDisableHeaderReuseSwitch();
+        private const string DisableHeaderStringSwitch = "Switch.Microsoft.AspNetCore.Kestrel.DisableStringReuse";
+        protected static readonly bool DisableStringReuse = GetDisableHeaderStringSwitch();
 
         private static readonly byte[] _bytesConnectionClose = Encoding.ASCII.GetBytes("\r\nConnection: close");
         private static readonly byte[] _bytesConnectionKeepAlive = Encoding.ASCII.GetBytes("\r\nConnection: keep-alive");
@@ -77,7 +77,7 @@ public HttpProtocol(HttpConnectionContext context)
             _context = context;
 
             ServerOptions = ServiceContext.ServerOptions;
-            HttpRequestHeaders = new HttpRequestHeaders(reuseHeaderValues: !DisableHeaderReuse);
+            HttpRequestHeaders = new HttpRequestHeaders(reuseHeaderValues: !DisableStringReuse);
             HttpResponseControl = this;
         }
 
@@ -1505,9 +1505,9 @@ public async ValueTask<FlushResult> WriteAsyncAwaited(Task initializeTask, ReadO
             }
         }
 
-        private static bool GetDisableHeaderReuseSwitch()
+        private static bool GetDisableHeaderStringSwitch()
         {
-            if (AppContext.TryGetSwitch(DisableHeaderReuseSwitch, out var disableHeaderReuse))
+            if (AppContext.TryGetSwitch(DisableHeaderStringSwitch, out var disableHeaderReuse))
             {
                 return disableHeaderReuse;
             }