From 80eb5ab745f066866bfe1959dc056f269f094f9b Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 19 Jun 2014 09:12:02 -0700 Subject: [PATCH] Use updated request cancellation API. --- src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs index 392f03a228..47c5cb7d14 100644 --- a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs +++ b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs @@ -319,14 +319,14 @@ namespace Microsoft.AspNet.StaticFiles var sendFile = _context.GetFeature(); if (sendFile != null && !string.IsNullOrEmpty(physicalPath)) { - await sendFile.SendFileAsync(physicalPath, 0, _length, _request.CallCanceled); + await sendFile.SendFileAsync(physicalPath, 0, _length, _context.OnRequestAborted); return; } Stream readStream = _fileInfo.CreateReadStream(); try { - await StreamCopyOperation.CopyToAsync(readStream, _response.Body, _length, _request.CallCanceled); + await StreamCopyOperation.CopyToAsync(readStream, _response.Body, _length, _context.OnRequestAborted); } finally { @@ -365,7 +365,7 @@ namespace Microsoft.AspNet.StaticFiles var sendFile = _context.GetFeature(); if (sendFile != null && !string.IsNullOrEmpty(physicalPath)) { - await sendFile.SendFileAsync(physicalPath, start, length, _request.CallCanceled); + await sendFile.SendFileAsync(physicalPath, start, length, _context.OnRequestAborted); return; } @@ -373,7 +373,7 @@ namespace Microsoft.AspNet.StaticFiles try { readStream.Seek(start, SeekOrigin.Begin); // TODO: What if !CanSeek? - await StreamCopyOperation.CopyToAsync(readStream, _response.Body, length, _request.CallCanceled); + await StreamCopyOperation.CopyToAsync(readStream, _response.Body, length, _context.OnRequestAborted); } finally {