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

Merge branch 'shalter/last-request' into dev

This commit is contained in:
Cesar Blum Silveira 2016-03-22 17:57:26 -07:00
parent f13c418a65 fd70fb732d
commit 3f0e65495e
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
View File

@ -37,8 +37,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {
if (SocketInput.RemoteIntakeFin) if (SocketInput.RemoteIntakeFin)
{ {
// We need to attempt to consume start lines and headers even after
// SocketInput.RemoteIntakeFin is set to true to ensure we don't close a
// connection without giving the application a chance to respond to a request
// sent immediately before the a FIN from the client.
if (TakeStartLine(SocketInput))
{
break;
}
return; return;
} }
await SocketInput; await SocketInput;
} }
@ -48,8 +58,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {
if (SocketInput.RemoteIntakeFin) if (SocketInput.RemoteIntakeFin)
{ {
// We need to attempt to consume start lines and headers even after
// SocketInput.RemoteIntakeFin is set to true to ensure we don't close a
// connection without giving the application a chance to respond to a request
// sent immediately before the a FIN from the client.
if (TakeMessageHeaders(SocketInput, FrameRequestHeaders))
{
break;
}
return; return;
} }
await SocketInput; await SocketInput;
} }