From 3cc0dd7a257207e27c4985b6d4c0617b00ca275e Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 17 Jul 2015 09:58:55 -0700 Subject: [PATCH 1/3] React to FeatureModel package change. --- src/Kestrel/ServerFactory.cs | 2 +- src/Kestrel/ServerRequest.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Kestrel/ServerFactory.cs b/src/Kestrel/ServerFactory.cs index 41fb30cd2e..1522c61df8 100644 --- a/src/Kestrel/ServerFactory.cs +++ b/src/Kestrel/ServerFactory.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Hosting.Server; +using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Server.Kestrel; using Microsoft.Framework.Configuration; using Microsoft.Framework.Runtime; diff --git a/src/Kestrel/ServerRequest.cs b/src/Kestrel/ServerRequest.cs index 5edfda327d..e1ac126af5 100644 --- a/src/Kestrel/ServerRequest.cs +++ b/src/Kestrel/ServerRequest.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Server.Kestrel.Http; From c199e5eee11370f586009178f34d080642f4bb9d Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 17 Jul 2015 13:07:30 -0700 Subject: [PATCH 2/3] Wait on user-defined OnStarting and OnCompleted callbacks --- src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs index 4689db0804..c21f6b7b84 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs @@ -197,7 +197,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { foreach (var entry in onStarting) { - entry.Key.Invoke(entry.Value); + entry.Key.Invoke(entry.Value).Wait(); } } } @@ -216,7 +216,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { try { - entry.Key.Invoke(entry.Value); + entry.Key.Invoke(entry.Value).Wait(); } catch { From 4a284e5f81d469c2740ac730b544fbe43c471fde Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Tue, 21 Jul 2015 14:17:11 -0700 Subject: [PATCH 3/3] Revert "React to FeatureModel package change." This should not have been in the release branch yet! This reverts commit 3cc0dd7a257207e27c4985b6d4c0617b00ca275e. --- src/Kestrel/ServerFactory.cs | 2 +- src/Kestrel/ServerRequest.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Kestrel/ServerFactory.cs b/src/Kestrel/ServerFactory.cs index 1522c61df8..41fb30cd2e 100644 --- a/src/Kestrel/ServerFactory.cs +++ b/src/Kestrel/ServerFactory.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Server.Kestrel; using Microsoft.Framework.Configuration; using Microsoft.Framework.Runtime; diff --git a/src/Kestrel/ServerRequest.cs b/src/Kestrel/ServerRequest.cs index e1ac126af5..5edfda327d 100644 --- a/src/Kestrel/ServerRequest.cs +++ b/src/Kestrel/ServerRequest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Server.Kestrel.Http;