Feedback

Author: JunTaoLuo

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingContext.cs

@@ -447,44 +447,46 @@ internal async Task<bool> TryServeFromCacheAsync()
                     if (ConditionalRequestSatisfied(cachedResponseHeaders))
                     {
                         _httpContext.Response.StatusCode = StatusCodes.Status304NotModified;
-                        return true;
-                    }
-
-                    var response = _httpContext.Response;
-                    // Copy the cached status code and response headers
-                    response.StatusCode = cachedResponse.StatusCode;
-                    foreach (var header in cachedResponse.Headers)
-                    {
-                        response.Headers.Add(header);
-                    }
-
-                    response.Headers[HeaderNames.Age] = age.TotalSeconds.ToString("F0", CultureInfo.InvariantCulture);
-
-                    if (_responseType == ResponseType.HeadersOnly)
-                    {
                         responseServed = true;
                     }
-                    else if (_responseType == ResponseType.FullReponse)
+                    else
                     {
-                        // Copy the cached response body
-                        var body = cachedResponse.Body;
-
-                        // Add a content-length if required
-                        if (response.ContentLength == null && string.IsNullOrEmpty(response.Headers[HeaderNames.TransferEncoding]))
+                        var response = _httpContext.Response;
+                        // Copy the cached status code and response headers
+                        response.StatusCode = cachedResponse.StatusCode;
+                        foreach (var header in cachedResponse.Headers)
                         {
-                            response.ContentLength = body.Length;
+                            response.Headers.Add(header);
                         }
 
-                        if (body.Length > 0)
+                        response.Headers[HeaderNames.Age] = age.TotalSeconds.ToString("F0", CultureInfo.InvariantCulture);
+
+                        if (_responseType == ResponseType.HeadersOnly)
                         {
-                            await response.Body.WriteAsync(body, 0, body.Length);
+                            responseServed = true;
                         }
+                        else if (_responseType == ResponseType.FullReponse)
+                        {
+                            // Copy the cached response body
+                            var body = cachedResponse.Body;
 
-                        responseServed = true;
-                    }
-                    else
-                    {
-                        throw new InvalidOperationException($"{nameof(_responseType)} not specified or is unrecognized.");
+                            // Add a content-length if required
+                            if (response.ContentLength == null && string.IsNullOrEmpty(response.Headers[HeaderNames.TransferEncoding]))
+                            {
+                                response.ContentLength = body.Length;
+                            }
+
+                            if (body.Length > 0)
+                            {
+                                await response.Body.WriteAsync(body, 0, body.Length);
+                            }
+
+                            responseServed = true;
+                        }
+                        else
+                        {
+                            throw new InvalidOperationException($"{nameof(_responseType)} not specified or is unrecognized.");
+                        }
                     }
                 }
                 else
@@ -496,24 +498,26 @@ internal async Task<bool> TryServeFromCacheAsync()
             if (!responseServed && RequestCacheControl.OnlyIfCached)
             {
                 _httpContext.Response.StatusCode = StatusCodes.Status504GatewayTimeout;
-                return true;
+                responseServed = true;
             }
 
             return responseServed;
         }
 
         internal bool ConditionalRequestSatisfied(ResponseHeaders cachedResponseHeaders)
         {
-            if (RequestHeaders.IfNoneMatch != null)
+            var ifNoneMatchHeader = RequestHeaders.IfNoneMatch;
+
+            if (ifNoneMatchHeader != null)
             {
-                if (RequestHeaders.IfNoneMatch.Count == 1 && RequestHeaders.IfNoneMatch[0].Equals(EntityTagHeaderValue.Any))
+                if (ifNoneMatchHeader.Count == 1 && ifNoneMatchHeader[0].Equals(EntityTagHeaderValue.Any))
                 {
                     return true;
                 }
 
                 if (cachedResponseHeaders.ETag != null)
                 {
-                    foreach (var tag in RequestHeaders.IfNoneMatch)
+                    foreach (var tag in ifNoneMatchHeader)
                     {
                         // TODO: use strong comparison
                         if (cachedResponseHeaders.ETag.Equals(tag))