This repository has been archived by the owner on Nov 20, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 193
Change SendFileAsync to use a fallback implementation instead of throwing #497
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 0 additions & 46 deletions
46
src/Microsoft.AspNet.Http.Extensions/Properties/Resources.Designer.cs
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/Microsoft.AspNet.Http.Extensions/StreamCopyOperation.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
using System; | ||
using System.Diagnostics; | ||
using System.IO; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
|
||
namespace Microsoft.AspNet.Http | ||
{ | ||
// FYI: In most cases the source will be a FileStream and the destination will be to the network. | ||
internal static class StreamCopyOperation | ||
{ | ||
internal static async Task CopyToAsync(Stream source, byte[] buffer, Stream destination, long? length, CancellationToken cancel) | ||
{ | ||
long? bytesRemaining = length; | ||
Debug.Assert(source != null); | ||
Debug.Assert(destination != null); | ||
Debug.Assert(!bytesRemaining.HasValue || bytesRemaining.Value >= 0); | ||
Debug.Assert(buffer != null); | ||
|
||
while (true) | ||
{ | ||
// The natural end of the range. | ||
if (bytesRemaining.HasValue && bytesRemaining.Value <= 0) | ||
{ | ||
return; | ||
} | ||
|
||
cancel.ThrowIfCancellationRequested(); | ||
|
||
int readLength = buffer.Length; | ||
if (bytesRemaining.HasValue) | ||
{ | ||
readLength = (int)Math.Min(bytesRemaining.Value, (long)readLength); | ||
} | ||
int count = await source.ReadAsync(buffer, 0, readLength, cancel); | ||
|
||
if (bytesRemaining.HasValue) | ||
{ | ||
bytesRemaining -= count; | ||
} | ||
|
||
// End of the source stream. | ||
if (count == 0) | ||
{ | ||
return; | ||
} | ||
|
||
cancel.ThrowIfCancellationRequested(); | ||
|
||
await destination.WriteAsync(buffer, 0, count, cancel); | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fallback makes SupportsSendFile unnecessary, remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not unnecessary. It's just convenient. But sure.