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

Fixing merge conflicts

This commit is contained in:
Louis DeJardin 2015-09-15 17:00:58 -07:00
parent 1f6aaebeda
commit 4193c92ba7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
Thread.Post( Thread.Post(
_this => _this =>
{ {
var self = (Connection)state; var shutdown = new UvShutdownReq(_this.Log);
var shutdown = new UvShutdownReq(self.Log);
shutdown.Init(_this.Thread.Loop); shutdown.Init(_this.Thread.Loop);
shutdown.Shutdown(_this._socket, (req, status, state2) => shutdown.Shutdown(_this._socket, (req, status, state2) =>
{ {
@ -144,10 +143,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
} }
Log.ConnectionKeepAlive(_connectionId); Log.ConnectionKeepAlive(_connectionId);
_frame = new Frame(this);
Thread.Post(
state => ((Frame)state).Consume(),
_frame);
break; break;
case ProduceEndType.SocketDisconnect: case ProduceEndType.SocketDisconnect:
if (_connectionState == ConnectionState.Disconnected) if (_connectionState == ConnectionState.Disconnected)