Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -640,14 +640,13 @@ private Task CreateResponseHeader(
{
var begin = SocketOutput.ProducingStart();
var end = begin;
if (_keepAlive)
if (_keepAlive && _responseHeaders.HasConnection)
{
foreach (var connectionValue in _responseHeaders.HeaderConnection)
var connection = _responseHeaders.HeaderConnection.ToString();

if (connection.IndexOf("close", StringComparison.OrdinalIgnoreCase) != -1)
{
if (connectionValue.IndexOf("close", StringComparison.OrdinalIgnoreCase) != -1)
{
_keepAlive = false;
}
_keepAlive = false;
}
}

Expand Down Expand Up @@ -834,6 +833,7 @@ private bool RequestUrlStartsWithPathBase(string requestUrl, out bool caseMatche

public static bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHeaders)
{
MemoryPoolIterator2 endName;
var scan = input.ConsumingStart();
var consumed = scan;
try
Expand All @@ -843,8 +843,15 @@ public static bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders req
while (!scan.IsEnd)
{
var beginName = scan;
scan.Seek(ref _vectorColons, ref _vectorCRs);
var endName = scan;
if (scan.Peek() == '\r' || scan.SeekCommonHeader())
{
endName = scan;
}
else
{
scan.Seek(ref _vectorColons, ref _vectorCRs);
endName = scan;
}

chFirst = scan.Take();
var beginValue = scan;
Expand Down
Loading