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

Harden framing epilog 

* Connection no longer needes Frame's processing Task
* Any exceptions from unusual processing is logged
This commit is contained in:
Louis DeJardin 2015-09-17 18:53:35 -07:00
parent 28250d9981
commit 30ec2cb0b1
2 changed files with 72 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
SocketInput = new SocketInput(Memory2); SocketInput = new SocketInput(Memory2);
SocketOutput = new SocketOutput(Thread, _socket, _connectionId, Log); SocketOutput = new SocketOutput(Thread, _socket, _connectionId, Log);
_frame = new Frame(this); _frame = new Frame(this);
_frameTask = Task.Run(_frame.ProcessFraming); Task.Run(_frame.ProcessFraming);
_socket.ReadStart(_allocCallback, _readCallback, this); _socket.ReadStart(_allocCallback, _readCallback, this);
} }

26
src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
View File

@ -9,6 +9,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Server.Kestrel.Infrastructure; using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.Framework.Logging;
using Microsoft.Framework.Primitives; using Microsoft.Framework.Primitives;
// ReSharper disable AccessToModifiedClosure // ReSharper disable AccessToModifiedClosure
@ -98,7 +99,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
_responseHeaders.HeaderDate = DateTime.UtcNow.ToString("r"); _responseHeaders.HeaderDate = DateTime.UtcNow.ToString("r");
} }
public async Task ProcessFraming() public async void ProcessFraming()
{
try
{ {
var terminated = false; var terminated = false;
while (!terminated) while (!terminated)
@ -157,15 +160,30 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
Reset(); Reset();
} }
}
// Connection Terminated! catch (Exception ex)
{
Log.LogVerbose("Connection processing ended abnormally", ex);
}
finally
{
try
{
// Inform client no more data will ever arrive
ConnectionControl.End(ProduceEndType.SocketShutdownSend); ConnectionControl.End(ProduceEndType.SocketShutdownSend);
// Wait for client to disconnect, or to receive unexpected data // Wait for client to either disconnect or send unexpected data
await SocketInput; await SocketInput;
// Dispose socket
ConnectionControl.End(ProduceEndType.SocketDisconnect); ConnectionControl.End(ProduceEndType.SocketDisconnect);
} }
catch(Exception ex)
{
Log.LogVerbose("Connection shutdown abnormally", ex);
}
}
}
public void OnStarting(Func<object, Task> callback, object state) public void OnStarting(Func<object, Task> callback, object state)
{ {