Fix issues from rebase

Author: DamianEdwards

src/Microsoft.AspNet.Server.Kestrel/Http/ConnectionContext.cs

@@ -18,6 +18,7 @@ public ConnectionContext(ConnectionContext context) : base(context)
             SocketInput = context.SocketInput;
             SocketOutput = context.SocketOutput;
             ConnectionControl = context.ConnectionControl;
+            DateHeaderValueManager = context.DateHeaderValueManager;
         }
 
         public SocketInput SocketInput { get; set; }

src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs

@@ -38,7 +38,7 @@ public Frame(ConnectionContext context) : base(context)
             FrameControl = this;
             StatusCode = 200;
             RequestHeaders = _requestHeaders;
-            _responseHeaders = new FrameResponseHeaders(DateHeaderValueManager);
+            _responseHeaders = new FrameResponseHeaders(DateHeaderValueManager.GetDateHeaderValue());
             ResponseHeaders = _responseHeaders;
         }
 
@@ -389,8 +389,8 @@ public void ProduceEnd(Exception ex)
                     // the app func has failed. https://github.com/aspnet/KestrelHttpServer/issues/43
                     _onStarting = null;
 
-                    ResponseHeaders = new FrameResponseHeaders(DateHeaderValueManager);
-                    ResponseHeaders["Content-Length"] = new[] { "0" };
+                    ResponseHeaders = new FrameResponseHeaders(DateHeaderValueManager.GetDateHeaderValue());
+                    ResponseHeaders["Content-Length"] = "0";
                 }
             }
 

src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.Generated.cs

@@ -10,7 +10,7 @@ public partial class FrameResponseHeaders
         public FrameResponseHeaders(string dateHeaderValue)
         {
             _Server = "Kestrel";
-            _Date = GetDateHeaderValue();
+            _Date = dateHeaderValue;
             _bits = 67108868L;
         }
     }

src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs

@@ -131,10 +131,4 @@ bool IDictionary<string, StringValues>.TryGetValue(string key, out StringValues
             return TryGetValueFast(key, out value);
         }
     }
-        private static string GetDateHeaderValue()
-    {
-            PumpTimer();
-
-            return _dateValue;
-        }
 }

src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs

@@ -15,15 +15,11 @@ public abstract class Listener : ListenerContext, IDisposable
     {
         protected Listener(ServiceContext serviceContext) : base(serviceContext)
         {
-            }
 
-        protected UvStreamHandle ListenSocket { get; private set; }
-        public Listener(IMemoryPool memory, DateHeaderValueManager dateHeaderValueManager)
-        {
-            Memory = memory;
-            DateHeaderValueManager = dateHeaderValueManager;
         }
 
+        protected UvStreamHandle ListenSocket { get; private set; }
+
         public Task StartAsync(
             string scheme,
             string host,

src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs

@@ -13,13 +13,15 @@ public ListenerContext() { }
         public ListenerContext(ServiceContext serviceContext)
         {
             Memory = serviceContext.Memory;
+            DateHeaderValueManager = serviceContext.DateHeaderValueManager;
         }
 
         public ListenerContext(ListenerContext listenerContext)
         {
             Thread = listenerContext.Thread;
             Application = listenerContext.Application;
             Memory = listenerContext.Memory;
+            DateHeaderValueManager = listenerContext.DateHeaderValueManager;
         }
 
         public KestrelThread Thread { get; set; }

src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs

@@ -18,7 +18,7 @@ public abstract class ListenerSecondary : ListenerContext, IDisposable
     {
         protected ListenerSecondary(ServiceContext serviceContext) : base(serviceContext)
         {
-            DateHeaderValueManager = dateHeaderValueManager;
+
         }
 
         UvPipeHandle DispatchPipe { get; set; }

src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs

@@ -73,16 +73,16 @@ private KestrelEngine(IApplicationShutdown appShutdownService)
             _serviceContext = new ServiceContext
             {
                 AppShutdown = appShutdownService,
-                Memory = new MemoryPool()
+                Memory = new MemoryPool(),
+                DateHeaderValueManager = new DateHeaderValueManager()
             };
 
             Threads = new List<KestrelThread>();
-            DateHeaderValueManager = new DateHeaderValueManager();
         }
 
         public Libuv Libuv { get; private set; }
+
         public List<KestrelThread> Threads { get; private set; }
-        public DateHeaderValueManager DateHeaderValueManager { get; private set; }
 
         public void Start(int count)
         {
@@ -105,7 +105,7 @@ public void Dispose()
             }
             Threads.Clear();
 
-            DateHeaderValueManager.Dispose();
+            _serviceContext.DateHeaderValueManager.Dispose();
         }
 
         public IDisposable CreateServer(string scheme, string host, int port, Func<Frame, Task> application)

src/Microsoft.AspNet.Server.Kestrel/ServiceContext.cs

@@ -11,5 +11,7 @@ public class ServiceContext
         public IApplicationShutdown AppShutdown { get; set; }
 
         public IMemoryPool Memory { get; set; }
+
+        public DateHeaderValueManager DateHeaderValueManager { get; set; }
     }
 }

test/Microsoft.AspNet.Server.KestrelTests/FrameResponseHeadersTests.cs

@@ -14,7 +14,8 @@ public class FrameResponseHeadersTests
         [Fact]
         public void InitialDictionaryContainsServerAndDate()
         {
-            IDictionary<string, StringValues> headers = new FrameResponseHeaders();
+            var dateHeaderValue = DateTime.UtcNow.ToString("r");
+            IDictionary<string, StringValues> headers = new FrameResponseHeaders(dateHeaderValue);
 
             Assert.Equal(2, headers.Count);
 
@@ -36,7 +37,8 @@ public void InitialDictionaryContainsServerAndDate()
         [Fact]
         public void InitialEntriesCanBeCleared()
         {
-            IDictionary<string, StringValues> headers = new FrameResponseHeaders();
+            var dateHeaderValue = DateTime.UtcNow.ToString("r");
+            IDictionary<string, StringValues> headers = new FrameResponseHeaders(dateHeaderValue);
 
             headers.Clear();
 

tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs

@@ -176,7 +176,7 @@ public partial class FrameResponseHeaders
         public FrameResponseHeaders(string dateHeaderValue)
         {{
             _Server = ""Kestrel"";
-            _Date = GetDateHeaderValue();
+            _Date = dateHeaderValue;
             _bits = {
                 1L << responseHeaders.First(header => header.Name == "Server").Index |
                 1L << responseHeaders.First(header => header.Name == "Date").Index