Merge remote-tracking branch 'upstream/master' into docker

1 files changed, 3 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
index 1ca5f1204..29b703e25 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
@@ -91,9 +91,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                     ThrottleCallback = ThrottleCallback
                 };
             }
-            var task = WriteToAsync(responseStream);
-
-            Task.WaitAll(task);
+            WriteToAsync(responseStream);
         }
 
         /// <summary>
@@ -101,13 +99,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// </summary>
         /// <param name="responseStream">The response stream.</param>
         /// <returns>Task.</returns>
-        private async Task WriteToAsync(Stream responseStream)
+        private void WriteToAsync(Stream responseStream)
         {
             try
             {
                 using (var src = SourceStream)
                 {
-                    await src.CopyToAsync(responseStream).ConfigureAwait(false);
+                    src.CopyTo(responseStream);
                 }
             }
             catch (Exception ex)