From f88631efb3055eeefeac1af27574499619b7461b Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 23 Oct 2015 15:05:09 -0700
Subject: [PATCH] React to breaking changes in StringValues

---
 src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs   | 4 ++--
 src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs    | 2 +-
 .../FrameRequestHeadersTests.cs                            | 4 ++--
 test/Microsoft.AspNet.Server.KestrelTests/Program.cs       | 7 ++-----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs
index beb926447c..a97a092098 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs
@@ -123,7 +123,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             StringValues value;
             return
                 TryGetValueFast(item.Key, out value) &&
-                object.Equals(value, item.Value);
+                value.Equals(item.Value);
         }
 
         bool IDictionary<string, StringValues>.ContainsKey(string key)
@@ -152,7 +152,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             StringValues value;
             return
                 TryGetValueFast(item.Key, out value) &&
-                object.Equals(value, item.Value) &&
+                value.Equals(item.Value) &&
                 RemoveFast(item.Key);
         }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
index c6afad0e77..3b20247e67 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
@@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
         public static bool TryGet(IDictionary<string, StringValues> headers, string name, out string value)
         {
             StringValues values;
-            if (!headers.TryGetValue(name, out values) || values == null)
+            if (!headers.TryGetValue(name, out values) || values.Count == 0)
             {
                 value = null;
                 return false;
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs b/test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs
index 24152ca199..302eebcf29 100644
--- a/test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs
+++ b/test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs
@@ -121,8 +121,8 @@ namespace Microsoft.AspNet.Server.KestrelTests
             IDictionary<string, StringValues> headers = new FrameRequestHeaders();
             var kv1 = new KeyValuePair<string, StringValues>("host", new[] { "localhost" });
             var kv2 = new KeyValuePair<string, StringValues>("custom", new[] { "value" });
-            var kv1b = new KeyValuePair<string, StringValues>("host", new[] { "localhost" });
-            var kv2b = new KeyValuePair<string, StringValues>("custom", new[] { "value" });
+            var kv1b = new KeyValuePair<string, StringValues>("host", new[] { "not-localhost" });
+            var kv2b = new KeyValuePair<string, StringValues>("custom", new[] { "not-value" });
 
             Assert.False(headers.ContainsKey("host"));
             Assert.False(headers.ContainsKey("custom"));
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/Program.cs b/test/Microsoft.AspNet.Server.KestrelTests/Program.cs
index 83dbb72393..813a581bf1 100644
--- a/test/Microsoft.AspNet.Server.KestrelTests/Program.cs
+++ b/test/Microsoft.AspNet.Server.KestrelTests/Program.cs
@@ -14,23 +14,20 @@ namespace Microsoft.AspNet.Server.KestrelTests
         private readonly IApplicationEnvironment env;
         private readonly IServiceProvider sp;
         private readonly ILibraryManager _libraryManager;
-        private readonly IApplicationShutdown _shutdown;
 
         public Program(
             IApplicationEnvironment env,
             IServiceProvider sp,
-            ILibraryManager libraryManager,
-            IApplicationShutdown shutown)
+            ILibraryManager libraryManager)
         {
             this.env = env;
             this.sp = sp;
             _libraryManager = libraryManager;
-            _shutdown = shutown;
         }
 
         public int Main()
         {
-            return new Xunit.Runner.Dnx.Program(env, sp, _libraryManager, _shutdown).Main(new string[]
+            return new Xunit.Runner.Dnx.Program(env, sp, _libraryManager).Main(new string[]
             {
                 "-class",
                 typeof(MultipleLoopTests).FullName