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

Always set "Connection: close" header for non keep-alive responses

This commit is contained in:
Stephen Halter 2016-08-09 17:35:01 -07:00
parent 8f4cc3003b
commit 5f4e60bf8d
6 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs
View File

@ -767,7 +767,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
} }
} }
if (!_keepAlive && !hasConnection && _httpVersion != Http.HttpVersion.Http10) if (!_keepAlive && !hasConnection)
{ {
responseHeaders.SetRawConnection("close", _bytesConnectionClose); responseHeaders.SetRawConnection("close", _bytesConnectionClose);
} }

2
test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedRequestTests.cs
View File

@ -75,6 +75,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
""); "");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"", "",
"Hello World"); "Hello World");
@ -111,6 +112,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"Hello World"); "Hello World");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"Content-Length: 7", "Content-Length: 7",
"", "",

2
test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs
View File

@ -44,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
await connection.SendEnd(sendString); await connection.SendEnd(sendString);
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {serviceContext.DateHeaderValue}", $"Date: {serviceContext.DateHeaderValue}",
"", "",
"Hello World!"); "Hello World!");
@ -68,6 +69,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"Hello World?"); "Hello World?");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {serviceContext.DateHeaderValue}", $"Date: {serviceContext.DateHeaderValue}",
"", "",
"Hello World!"); "Hello World!");

8
test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs
View File

@ -24,6 +24,8 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
using (var connection = server.CreateConnection()) using (var connection = server.CreateConnection())
{ {
await connection.SendEnd( await connection.SendEnd(
"GET / HTTP/1.1",
"",
"GET / HTTP/1.0", "GET / HTTP/1.0",
"", "",
""); "");
@ -31,6 +33,12 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"Content-Length: 0",
"Server: Kestrel",
"",
"HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}",
"Server: Kestrel", "Server: Kestrel",
"", "",
""); "");

8
test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
View File

@ -135,6 +135,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"Hello World"); "Hello World");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"", "",
"Hello World"); "Hello World");
@ -259,6 +260,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"Hello World"); "Hello World");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"", "",
"Hello World"); "Hello World");
@ -289,6 +291,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"\r\n"); "\r\n");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"Content-Length: 7", "Content-Length: 7",
"", "",
@ -322,6 +325,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"\r\n"); "\r\n");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"", "",
"Goodbye"); "Goodbye");
@ -354,6 +358,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"Hello World"); "Hello World");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"Content-Length: 7", "Content-Length: 7",
"", "",
@ -407,6 +412,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
"\r\n"); "\r\n");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"\r\n"); "\r\n");
} }
@ -472,6 +478,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
""); "");
await connection.ReceiveEnd( await connection.ReceiveEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"", "",
""); "");
@ -1050,6 +1057,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
""); "");
await connection.ReceiveForcedEnd( await connection.ReceiveForcedEnd(
"HTTP/1.1 200 OK", "HTTP/1.1 200 OK",
"Connection: close",
$"Date: {testContext.DateHeaderValue}", $"Date: {testContext.DateHeaderValue}",
"Content-Length: 11", "Content-Length: 11",
"", "",

6
test/Microsoft.AspNetCore.Server.KestrelTests/RequestTargetProcessingTests.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
using (var connection = server.CreateConnection()) using (var connection = server.CreateConnection())
{ {
await connection.SendEnd( await connection.SendEnd(
"GET /%41%CC%8A/A/../B/%41%CC%8A HTTP/1.0", "GET /%41%CC%8A/A/../B/%41%CC%8A HTTP/1.1",
"", "",
""); "");
await connection.ReceiveEnd( await connection.ReceiveEnd(
@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
using (var connection = server.CreateConnection()) using (var connection = server.CreateConnection())
{ {
await connection.SendEnd( await connection.SendEnd(
$"GET {requestTarget} HTTP/1.0", $"GET {requestTarget} HTTP/1.1",
"", "",
""); "");
await connection.ReceiveEnd( await connection.ReceiveEnd(
@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
using (var connection = server.CreateConnection()) using (var connection = server.CreateConnection())
{ {
await connection.SendEnd( await connection.SendEnd(
$"GET {requestTarget} HTTP/1.0", $"GET {requestTarget} HTTP/1.1",
"", "",
""); "");
await connection.ReceiveEnd( await connection.ReceiveEnd(