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

Avoid double allocating the HttpConnectionContext (#12225)

This commit is contained in:
David Fowler 2019-07-16 07:58:11 -07:00 committed by GitHub
parent 7f2a97a603
commit ba15186bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
View File

@ -35,6 +35,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
_systemClock = _context.ServiceContext.SystemClock;
_timeoutControl = new TimeoutControl(this);
// Tests override the timeout control sometimes
_context.TimeoutControl ??= _timeoutControl;
}
private IKestrelTrace Log => _context.ServiceContext.Log;
@ -48,31 +51,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
IRequestProcessor requestProcessor = null;
var httpConnectionContext = new HttpConnectionContext
{
ConnectionId = _context.ConnectionId,
ConnectionFeatures = _context.ConnectionFeatures,
MemoryPool = _context.MemoryPool,
LocalEndPoint = _context.LocalEndPoint,
RemoteEndPoint = _context.RemoteEndPoint,
ServiceContext = _context.ServiceContext,
ConnectionContext = _context.ConnectionContext,
TimeoutControl = _timeoutControl,
Transport = _context.Transport
};
switch (SelectProtocol())
{
case HttpProtocols.Http1:
// _http1Connection must be initialized before adding the connection to the connection manager
requestProcessor = _http1Connection = new Http1Connection(httpConnectionContext);
requestProcessor = _http1Connection = new Http1Connection(_context);
_protocolSelectionState = ProtocolSelectionState.Selected;
break;
case HttpProtocols.Http2:
// _http2Connection must be initialized before yielding control to the transport thread,
// to prevent a race condition where _http2Connection.Abort() is called just as
// _http2Connection is about to be initialized.
requestProcessor = new Http2Connection(httpConnectionContext);
requestProcessor = new Http2Connection(_context);
_protocolSelectionState = ProtocolSelectionState.Selected;
break;
case HttpProtocols.None:

7
src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs
View File

@ -34,12 +34,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
ServiceContext = _serviceContext,
ConnectionFeatures = connectionContext.Features,
MemoryPool = memoryPoolFeature.MemoryPool,
Transport = connectionContext.Transport
Transport = connectionContext.Transport,
LocalEndPoint = connectionContext.LocalEndPoint as IPEndPoint,
RemoteEndPoint = connectionContext.RemoteEndPoint as IPEndPoint
};
httpConnectionContext.LocalEndPoint = connectionContext.LocalEndPoint as IPEndPoint;
httpConnectionContext.RemoteEndPoint = connectionContext.RemoteEndPoint as IPEndPoint;
var connection = new HttpConnection(httpConnectionContext);
return connection.ProcessRequestsAsync(_application);