Skip to content

Fix HttpResponseStreamWriter #19216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2020
Merged

Fix HttpResponseStreamWriter #19216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840aa0a
fix HttpResponseStreamWriter
jkotalik Feb 21, 2020
d80f758
Feedback
jkotalik Feb 21, 2020
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
32 changes: 14 additions & 18 deletions src/Http/WebUtilities/src/HttpResponseStreamWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,18 @@ public override void Write(ReadOnlySpan<char> value)
throw new ObjectDisposedException(nameof(HttpResponseStreamWriter));
}

var written = 0;
while (written < value.Length)
var remaining = value.Length;
while (remaining > 0)
{
if (_charBufferCount == _charBufferSize)
{
FlushInternal(flushEncoder: false);
}

written = CopyToCharBuffer(value);

if (written < value.Length)
{
value = value.Slice(written);
}
var written = CopyToCharBuffer(value);

remaining -= written;
value = value.Slice(written);
};
}

Expand Down Expand Up @@ -339,20 +337,18 @@ private async Task WriteAsyncAwaited(ReadOnlyMemory<char> value)
Debug.Assert(value.Length > 0);
Debug.Assert(_charBufferSize - _charBufferCount < value.Length);

int written = 0;
while (written < value.Length)
var remaining = value.Length;
while (remaining > 0)
{
if (_charBufferCount == _charBufferSize)
{
await FlushInternalAsync(flushEncoder: false);
}

written = CopyToCharBuffer(value.Span);

if (written < value.Length)
{
value = value.Slice(written);
}
var written = CopyToCharBuffer(value.Span);

remaining -= written;
value = value.Slice(written);
};
}

Expand Down Expand Up @@ -389,8 +385,8 @@ public override Task WriteLineAsync(ReadOnlyMemory<char> value, CancellationToke

private async Task WriteLineAsyncAwaited(ReadOnlyMemory<char> value)
{
await WriteAsyncAwaited(value);
await WriteAsyncAwaited(NewLine);
await WriteAsync(value);
await WriteAsync(NewLine);
}

// We want to flush the stream when Flush/FlushAsync is explicitly
Expand Down
6 changes: 6 additions & 0 deletions src/Http/WebUtilities/test/HttpResponseStreamWriterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ public void WriteCharArray_WritesToStream(int byteLength)
[InlineData(1024)]
[InlineData(1050)]
[InlineData(2048)]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1)]
public void WriteReadOnlySpanChar_WritesToStream(int byteLength)
{
// Arrange
Expand Down Expand Up @@ -290,6 +291,7 @@ public void WriteReadOnlySpanChar_WritesToStream(int byteLength)
[InlineData(1050, "\r\n")]
[InlineData(2046, "\r\n")]
[InlineData(2048, "\r\n")]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1, "\r\n")]
public void WriteLineReadOnlySpanChar_WritesToStream(int byteLength, string newLine)
{
// Arrange
Expand Down Expand Up @@ -360,6 +362,7 @@ public async Task WriteCharArrayAsync_WritesToStream(int byteLength)
[InlineData(1024)]
[InlineData(1050)]
[InlineData(2048)]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1)]
public async Task WriteReadOnlyMemoryAsync_WritesToStream(int byteLength)
{
// Arrange
Expand Down Expand Up @@ -412,6 +415,9 @@ public async Task WriteReadOnlyMemoryAsync_TokenCanceled_ReturnsCanceledTask()
[InlineData(1050, 2)]
[InlineData(2046, 2)]
[InlineData(2048, 2)]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1, 1)]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1, 2)]
[InlineData(HttpResponseStreamWriter.DefaultBufferSize + 1, HttpResponseStreamWriter.DefaultBufferSize)]
public async Task WriteLineReadOnlyMemoryAsync_WritesToStream(int byteLength, int newLineLength)
{
// Arrange
Expand Down