Pass HttpContext.RequestAborted to WebDAV response execution

Fixes #47, this time for real!

Author: fubar-coder

src/FubarDev.WebDavServer.AspNetCore/WebDavIndirectResult.cs

@@ -1,4 +1,4 @@
-// <copyright file="WebDavIndirectResult.cs" company="Fubar Development Junker">
+// <copyright file="WebDavIndirectResult.cs" company="Fubar Development Junker">
 // Copyright (c) Fubar Development Junker. All rights reserved.
 // </copyright>
 
@@ -63,7 +63,7 @@ public override async Task ExecuteResultAsync(ActionContext context)
             if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
             {
                 var loggingResponse = new LoggingWebDavResponse(_dispatcher);
-                await _result.ExecuteResultAsync(loggingResponse, CancellationToken.None).ConfigureAwait(false);
+                await _result.ExecuteResultAsync(loggingResponse, context.HttpContext.RequestAborted).ConfigureAwait(false);
                 if (!string.IsNullOrEmpty(loggingResponse.ContentType))
                 {
                     var mediaType = new MediaType(loggingResponse.ContentType);
@@ -77,7 +77,7 @@ public override async Task ExecuteResultAsync(ActionContext context)
             }
 
             // Writes the XML response
-            await _result.ExecuteResultAsync(new WebDavResponse(_dispatcher, response), CancellationToken.None).ConfigureAwait(false);
+            await _result.ExecuteResultAsync(new WebDavResponse(_dispatcher, response), context.HttpContext.RequestAborted).ConfigureAwait(false);
         }
     }
 }

src/FubarDev.WebDavServer/Handlers/Impl/GetResults/WebDavPartialDocumentResult.cs

@@ -89,61 +89,66 @@ public override async Task ExecuteResultAsync(IWebDavResponse response, Cancella
                     contentType = MimeTypesMap.DefaultMimeType;
                 }
 
-                HttpContent content;
                 if (_rangeItems.Count == 1)
                 {
                     // No multipart content
                     var rangeItem = _rangeItems.Single();
                     var streamView = views.Single();
-                    content = new StreamContent(streamView);
-                    try
+                    using (var streamContent = new StreamContent(streamView))
                     {
-                        content.Headers.ContentRange = new ContentRangeHeaderValue(rangeItem.From, rangeItem.To, _document.Length);
-                        content.Headers.ContentLength = rangeItem.Length;
-                    }
-                    catch
-                    {
-                        content.Dispose();
-                        throw;
-                    }
+                        streamContent.Headers.ContentRange = new ContentRangeHeaderValue(
+                            rangeItem.From,
+                            rangeItem.To,
+                            _document.Length);
+                        streamContent.Headers.ContentLength = rangeItem.Length;
+
+                        streamContent.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
+
+                        await SetPropertiesToContentHeaderAsync(streamContent, properties, ct)
+                            .ConfigureAwait(false);
 
-                    content.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
+                        foreach (var header in streamContent.Headers)
+                        {
+                            response.Headers.Add(header.Key, header.Value.ToArray());
+                        }
+
+                        // Use the CopyToAsync function of the stream itself, because
+                        // we're able to pass the cancellation token. This is a workaround
+                        // for issue dotnet/corefx#9071 and fixes FubarDevelopment/WebDavServer#47.
+                        await streamView.CopyToAsync(response.Body, 81920, ct)
+                            .ConfigureAwait(false);
+                    }
                 }
                 else
                 {
                     // Multipart content
-                    var multipart = new MultipartContent("byteranges");
-                    try
+                    using (var multipart = new MultipartContent("byteranges"))
                     {
                         var index = 0;
                         foreach (var rangeItem in _rangeItems)
                         {
                             var streamView = views[index++];
                             var partContent = new StreamContent(streamView);
-                            partContent.Headers.ContentRange = new ContentRangeHeaderValue(rangeItem.From, rangeItem.To, _document.Length);
+                            partContent.Headers.ContentRange = new ContentRangeHeaderValue(
+                                rangeItem.From,
+                                rangeItem.To,
+                                _document.Length);
                             partContent.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
                             partContent.Headers.ContentLength = rangeItem.Length;
                             multipart.Add(partContent);
                         }
-                    }
-                    catch
-                    {
-                        multipart.Dispose();
-                        throw;
-                    }
 
-                    content = multipart;
-                }
+                        await SetPropertiesToContentHeaderAsync(multipart, properties, ct)
+                            .ConfigureAwait(false);
 
-                using (content)
-                {
-                    await SetPropertiesToContentHeaderAsync(content, properties, ct)
-                        .ConfigureAwait(false);
-
-                    foreach (var header in content.Headers)
-                        response.Headers.Add(header.Key, header.Value.ToArray());
+                        foreach (var header in multipart.Headers)
+                        {
+                            response.Headers.Add(header.Key, header.Value.ToArray());
+                        }
 
-                    await content.CopyToAsync(response.Body).ConfigureAwait(false);
+                        // TODO: Workaround for issue dotnet/corefx#9071
+                        await multipart.CopyToAsync(response.Body).ConfigureAwait(false);
+                    }
                 }
             }
             finally