Merge branch 'master' into xml

1 files changed, 1 insertions, 6 deletions

diff --git a/Emby.Server.Implementations/Services/HttpResult.cs b/Emby.Server.Implementations/Services/HttpResult.cs
index 296da2f7a..b6758486c 100644
--- a/Emby.Server.Implementations/Services/HttpResult.cs
+++ b/Emby.Server.Implementations/Services/HttpResult.cs
@@ -43,14 +43,9 @@ namespace Emby.Server.Implementations.Services
             {
                 var contentLength = bytesResponse.Length;
 
-                if (response != null)
-                {
-                    response.SetContentLength(contentLength);
-                }
-
                 if (contentLength > 0)
                 {
-                    await responseStream.WriteAsync(bytesResponse, 0, contentLength).ConfigureAwait(false);
+                    await responseStream.WriteAsync(bytesResponse, 0, contentLength, cancellationToken).ConfigureAwait(false);
                 }
                 return;
             }