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

Perf: More efficient range header checks.

This commit is contained in:
Chris R 2016-05-27 09:32:53 -07:00
parent 59262122a8
commit dda9376a0c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
View File

@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Http.Headers;
using Microsoft.AspNetCore.StaticFiles.Infrastructure; using Microsoft.AspNetCore.StaticFiles.Infrastructure;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
namespace Microsoft.AspNetCore.StaticFiles namespace Microsoft.AspNetCore.StaticFiles
@ -228,21 +229,32 @@ namespace Microsoft.AspNetCore.StaticFiles
return; return;
} }
var rangeHeader = _requestHeaders.Range; var rawRangeHeader = _request.Headers[HeaderNames.Range];
if (rangeHeader == null) if (StringValues.IsNullOrEmpty(rawRangeHeader))
{ {
return; return;
} }
if (rangeHeader.Ranges.Count > 1) // Perf: Check for a single entry before parsing it
if (rawRangeHeader.Count > 1 || rawRangeHeader[0].IndexOf(',') >= 0)
{ {
// The spec allows for multiple ranges but we choose not to support them because the client may request // The spec allows for multiple ranges but we choose not to support them because the client may request
// very strange ranges (e.g. each byte separately, overlapping ranges, etc.) that could negatively // very strange ranges (e.g. each byte separately, overlapping ranges, etc.) that could negatively
// impact the server. Ignore the header and serve the response normally. // impact the server. Ignore the header and serve the response normally.
_logger.LogMultipleFileRanges(rangeHeader.ToString()); _logger.LogMultipleFileRanges(rawRangeHeader.ToString());
return; return;
} }
var rangeHeader = _requestHeaders.Range;
if (rangeHeader == null)
{
// Invalid
return;
}
// Already verified above
Debug.Assert(rangeHeader.Ranges.Count == 1);
// 14.27 If-Range // 14.27 If-Range
var ifRangeHeader = _requestHeaders.IfRange; var ifRangeHeader = _requestHeaders.IfRange;
if (ifRangeHeader != null) if (ifRangeHeader != null)