From 04f6446a50419e025df909033a85e5c36123a2bf Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Thu, 17 Sep 2015 18:22:09 -0700 Subject: [PATCH] Updates for PR feedback --- samples/SampleApp/Startup.cs | 2 -- samples/SampleApp/project.json | 1 + src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs | 3 --- src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs | 3 --- src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs | 2 +- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/samples/SampleApp/Startup.cs b/samples/SampleApp/Startup.cs index 4e1d25519f..f74fffe57e 100644 --- a/samples/SampleApp/Startup.cs +++ b/samples/SampleApp/Startup.cs @@ -24,8 +24,6 @@ namespace SampleApp context.Request.Path, context.Request.QueryString); - await context.Request.Body.CopyToAsync(Console.OpenStandardOutput()); - context.Response.ContentLength = 11; context.Response.ContentType = "text/plain"; await context.Response.WriteAsync("Hello world"); diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index b77f0a7dd2..35885e8e3f 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -13,6 +13,7 @@ } }, "commands": { + "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel", "run": "Microsoft.AspNet.Server.Kestrel", "run-socket": "Microsoft.AspNet.Server.Kestrel --server.urls http://unix:/tmp/kestrel-test.sock", "kestrel": "Microsoft.AspNet.Server.Kestrel" diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs index 72a753a6f9..c9d5ce2d24 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs @@ -12,9 +12,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { public class Connection : ConnectionContext, IConnectionControl { - private const int EOF = -4095; - private const int ECONNRESET = -4077; - private static readonly Action _readCallback = ReadCallback; private static readonly Func _allocCallback = AllocCallback; diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs index 944d9807ec..465e2b25f3 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs @@ -9,10 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.Framework.Logging; using Microsoft.Framework.Primitives; -using System.Numerics; -using Microsoft.AspNet.Hosting.Builder; // ReSharper disable AccessToModifiedClosure diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs index 7e35251e38..ecf62582e5 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs @@ -211,7 +211,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http void ISocketOutput.Write(ArraySegment buffer, bool immediate) { - ((ISocketOutput)this).WriteAsync(buffer, immediate).Wait(); + ((ISocketOutput)this).WriteAsync(buffer, immediate).GetAwaiter().GetResult(); } Task ISocketOutput.WriteAsync(ArraySegment buffer, bool immediate, CancellationToken cancellationToken)