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

Merge branch 'release' into dev

This commit is contained in:
Cesar Blum Silveira 2016-04-12 15:06:42 -07:00
parent 97dcfbfbe1 7b63846357
commit b9c2b29152
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
View File

@ -154,9 +154,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {
// Frame.Abort calls user code while this method is always // Frame.Abort calls user code while this method is always
// called from a libuv thread. // called from a libuv thread.
System.Threading.ThreadPool.QueueUserWorkItem(state => ThreadPool.Run(() =>
{ {
var connection = (Connection)state; var connection = this;
lock (connection._stateLock) lock (connection._stateLock)
{ {
@ -166,10 +166,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
} }
else else
{ {
connection._frame.Abort(); connection._frame?.Abort();
} }
} }
}, this); });
} }
// Called on Libuv thread // Called on Libuv thread