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

Port fix for #6875: Only set Content-Length when serving body (#6888) 

Addresses #6887
This commit is contained in:
Jass Bagga 2017-09-25 16:01:15 -07:00 committed by GitHub
parent 1ca5884388
commit bd8b4d86df
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
// Assuming the request is not a range request, the Content-Length header is set to the length of the entire file. // Assuming the request is not a range request, the Content-Length header is set to the length of the entire file.
// If the request is a valid range request, this header is overwritten with the length of the range as part of the // If the request is a valid range request, this header is overwritten with the length of the range as part of the
// range processing (see method SetContentLength). // range processing (see method SetContentLength).
response.ContentLength = fileLength.Value; if (serveBody)
{
response.ContentLength = fileLength.Value;
}
if (enableRangeProcessing) if (enableRangeProcessing)
{ {
SetAcceptRangeHeader(context); SetAcceptRangeHeader(context);

4
test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
View File

@ -376,7 +376,7 @@ namespace Microsoft.AspNetCore.Mvc
var streamReader = new StreamReader(httpResponse.Body); var streamReader = new StreamReader(httpResponse.Body);
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
Assert.Equal(11, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);
@ -417,7 +417,7 @@ namespace Microsoft.AspNetCore.Mvc
var streamReader = new StreamReader(httpResponse.Body); var streamReader = new StreamReader(httpResponse.Body);
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
Assert.Equal(11, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);

4
test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
View File

@ -366,7 +366,7 @@ namespace Microsoft.AspNetCore.Mvc
var streamReader = new StreamReader(httpResponse.Body); var streamReader = new StreamReader(httpResponse.Body);
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
Assert.Equal(11, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);
@ -408,7 +408,7 @@ namespace Microsoft.AspNetCore.Mvc
var streamReader = new StreamReader(httpResponse.Body); var streamReader = new StreamReader(httpResponse.Body);
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
Assert.Equal(11, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);

4
test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
View File

@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Mvc
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]); Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
Assert.Equal(34, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.Mvc
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]); Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
Assert.Equal(34, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);

4
test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
View File

@ -313,7 +313,7 @@ namespace Microsoft.AspNetCore.Mvc
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]); Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
Assert.Equal(33, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);
@ -355,7 +355,7 @@ namespace Microsoft.AspNetCore.Mvc
var body = streamReader.ReadToEndAsync().Result; var body = streamReader.ReadToEndAsync().Result;
Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode); Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]); Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
Assert.Equal(33, httpResponse.ContentLength); Assert.Null(httpResponse.ContentLength);
Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]); Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]); Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
Assert.Empty(body); Assert.Empty(body);