From 0ccdd69d226d0693c17b79b697a480fbec80904e Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Sun, 17 Jan 2016 17:46:25 +0000
Subject: [PATCH] Sync over multi async should just wait once

---
 .../Http/Frame.cs                              | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
index dffec228b..4ffa3a930 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
@@ -401,8 +401,7 @@ protected async Task FireOnCompleted()
 
         public void Flush()
         {
-            ProduceStartAndFireOnStarting(immediate: false).GetAwaiter().GetResult();
-            SocketOutput.Write(_emptyData, immediate: true);
+            FlushAsync(CancellationToken.None).GetAwaiter().GetResult();
         }
 
         public async Task FlushAsync(CancellationToken cancellationToken)
@@ -413,20 +412,7 @@ public async Task FlushAsync(CancellationToken cancellationToken)
 
         public void Write(ArraySegment<byte> data)
         {
-            ProduceStartAndFireOnStarting(immediate: false).GetAwaiter().GetResult();
-
-            if (_autoChunk)
-            {
-                if (data.Count == 0)
-                {
-                    return;
-                }
-                WriteChunkedAsync(data, RequestAborted);
-            }
-            else
-            {
-                SocketOutput.Write(data, immediate: true);
-            }
+            WriteAsync(data, CancellationToken.None).GetAwaiter().GetResult();
         }
 
         public Task WriteAsync(ArraySegment<byte> data, CancellationToken cancellationToken)