Merge branch 'release' into dev

This commit is contained in:
Chris Ross (ASP.NET) 2018-03-19 09:11:19 -07:00
commit 7f0602d2b1
1 changed files with 4 additions and 13 deletions

View File

@ -327,21 +327,12 @@ namespace Microsoft.AspNetCore.WebUtilities
builder.WriteByte(b); builder.WriteByte(b);
_bufferOffset++; _bufferOffset++;
_bufferCount--; _bufferCount--;
if (b == CR) if (b == LF && foundCR)
{ {
foundCR = true; foundCRLF = true;
} return;
else if (b == LF)
{
if (foundCR)
{
foundCRLF = true;
}
else
{
foundCR = false;
}
} }
foundCR = b == CR;
} }
private string DecodeLine(MemoryStream builder, bool foundCRLF) private string DecodeLine(MemoryStream builder, bool foundCRLF)