huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup fileLength use

This commit is contained in:
Pranav K 2017-06-16 17:51:17 -07:00
parent 3fc3d8d060
commit f824704741
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNetCore.Mvc.Core/Internal/FileResultExecutorBase.cs
View File

@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
if (IfRangeValid(context, httpRequestHeaders, lastModified, etag)) if (IfRangeValid(context, httpRequestHeaders, lastModified, etag))
{ {
return SetRangeHeaders(context, httpRequestHeaders, fileLength); return SetRangeHeaders(context, httpRequestHeaders, fileLength.Value);
} }
} }
} }
@ -260,7 +260,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
private static (RangeItemHeaderValue range, long rangeLength, bool serveBody) SetRangeHeaders( private static (RangeItemHeaderValue range, long rangeLength, bool serveBody) SetRangeHeaders(
ActionContext context, ActionContext context,
RequestHeaders httpRequestHeaders, RequestHeaders httpRequestHeaders,
long? fileLength) long fileLength)
{ {
var response = context.HttpContext.Response; var response = context.HttpContext.Response;
var httpResponseHeaders = response.GetTypedHeaders(); var httpResponseHeaders = response.GetTypedHeaders();
@ -270,7 +270,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
var (isRangeRequest, range) = RangeHelper.ParseRange( var (isRangeRequest, range) = RangeHelper.ParseRange(
context.HttpContext, context.HttpContext,
httpRequestHeaders, httpRequestHeaders,
fileLength.Value); fileLength);
if (!isRangeRequest) if (!isRangeRequest)
{ {
@ -283,10 +283,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
// SHOULD include a Content-Range field with a byte-range-resp-spec of "*". The instance-length specifies // SHOULD include a Content-Range field with a byte-range-resp-spec of "*". The instance-length specifies
// the current length of the selected resource. e.g. */length // the current length of the selected resource. e.g. */length
response.StatusCode = StatusCodes.Status416RangeNotSatisfiable; response.StatusCode = StatusCodes.Status416RangeNotSatisfiable;
if (fileLength.HasValue) httpResponseHeaders.ContentRange = new ContentRangeHeaderValue(fileLength);
{
httpResponseHeaders.ContentRange = new ContentRangeHeaderValue(fileLength.Value);
}
return (range: null, rangeLength: 0, serveBody: false); return (range: null, rangeLength: 0, serveBody: false);
} }
@ -294,7 +291,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
httpResponseHeaders.ContentRange = new ContentRangeHeaderValue( httpResponseHeaders.ContentRange = new ContentRangeHeaderValue(
range.From.Value, range.From.Value,
range.To.Value, range.To.Value,
fileLength.Value); fileLength);
response.StatusCode = StatusCodes.Status206PartialContent; response.StatusCode = StatusCodes.Status206PartialContent;
// Overwrite the Content-Length header for valid range requests with the range length. // Overwrite the Content-Length header for valid range requests with the range length.