Clean up

Author: JunTaoLuo

samples/ResponseCachingSample/Startup.cs

@@ -20,7 +20,6 @@ public void ConfigureServices(IServiceCollection services)
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseDeveloperExceptionPage();
             app.UseResponseCaching();
             app.Run(async (context) =>
             {
@@ -30,7 +29,7 @@ public void Configure(IApplicationBuilder app)
                     Public = true,
                     MaxAge = TimeSpan.FromSeconds(10)                    
                 };
-                context.Response.GetTypedHeaders().Append("Vary", "Accept-Language");
+                context.Response.GetTypedHeaders().AppendList("Vary", new string[] { "Accept-Encoding", "Non-Existent" });
 
                 await context.Response.WriteAsync("Hello World! " + DateTime.UtcNow);
             });

samples/ResponseCachingSample/project.json

@@ -1,7 +1,6 @@
 {
   "version": "1.1.0-*",
   "dependencies": {
-    "Microsoft.AspNetCore.Diagnostics": "0.1.0-*",
     "Microsoft.AspNetCore.ResponseCaching": "0.1.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*",

src/Microsoft.AspNetCore.ResponseCaching/ResponseCache/CachedVaryBy.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.Extensions.Primitives;
+
 namespace Microsoft.AspNetCore.ResponseCaching
 {
     public class CachedVaryBy : IResponseCacheEntry
@@ -9,8 +11,6 @@ public class CachedVaryBy : IResponseCacheEntry
 
         public ResponseCacheEntryType Type => ResponseCacheEntryType.VaryBy;
 
-        public string[] Headers { get; set; }
-
-        public string[] Params { get; set; }
+        public StringValues Headers { get; set; }
     }
 }

src/Microsoft.AspNetCore.ResponseCaching/ResponseCache/DefaultResponseCacheEntrySerializer.cs

@@ -86,23 +86,9 @@ private static IResponseCacheEntry ReadCachedResponse(BinaryReader reader)
 
         private static IResponseCacheEntry ReadCachedVaryBy(BinaryReader reader)
         {
-            var headerCount = reader.ReadInt32();
-            var headerArray = new string[headerCount];
-            for (var index = 0; index < headerCount; index++)
-            {
-                var value = reader.ReadString();
-                headerArray[index] = value;
-            }
+            var headers = reader.ReadString().Split(',');
 
-            var paramCount = reader.ReadInt32();
-            var paramArray = new string[paramCount];
-            for (var index = 0; index < paramCount; index++)
-            {
-                var value = reader.ReadString();
-                paramArray[index] = value;
-            }
-
-            return new CachedVaryBy { Headers = headerArray, Params = paramArray };
+            return new CachedVaryBy { Headers = headers };
         }
 
         public static void Write(BinaryWriter writer, IResponseCacheEntry entry)
@@ -147,30 +133,7 @@ private static void WriteCachedResponse(BinaryWriter writer, CachedResponse entr
 
         private static void WriteCachedVaryBy(BinaryWriter writer, CachedVaryBy entry)
         {
-            if (entry.Headers == null)
-            {
-                writer.Write(0);
-            }
-            else
-            {
-                writer.Write(entry.Headers.Length);
-                foreach (var header in entry.Headers)
-                {
-                    writer.Write(header);
-                }
-            }
-            if (entry.Params == null)
-            {
-                writer.Write(0);
-            }
-            else
-            {
-                writer.Write(entry.Params.Length);
-                foreach (var param in entry.Params)
-                {
-                    writer.Write(param);
-                }
-            }
+            writer.Write(entry.Headers);
         }
     }
 }

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingContext.cs

@@ -83,10 +83,17 @@ private string CreateVaryByCacheKey(CachedVaryBy varyBy)
 
                 foreach (var header in varyBy.Headers)
                 {
+                    var value = request.Headers[header].ToString();
+                    // null vs Empty?
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        value = "null";
+                    }
+
                     builder.Append(header)
                         .Append("=")
-                        .Append(request.Headers[header].ToString() ?? "null") // null vs Empty?
-                        .Append(",");
+                        .Append(value)
+                        .Append(";");
                 }
 
                 // Parse querystring params

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingExtensions.cs

@@ -9,7 +9,6 @@ public static class ResponseCachingExtensions
     {
         public static IApplicationBuilder UseResponseCaching(this IApplicationBuilder app)
         {
-
             return app.UseMiddleware<ResponseCachingMiddleware>();
         }
     }