Implement Stream Flush+FlushAsync fully

Streams should pass through the flush and not assume the underlying
Stream's Flush behaviour
This commit is contained in:
Ben Adams 2017-01-23 13:51:57 +00:00
parent 10fe5e6fa2
commit cac6ade7c9
4 changed files with 16 additions and 7 deletions

View File

@ -71,6 +71,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
_inner.Flush(); _inner.Flush();
} }
public override Task FlushAsync(CancellationToken cancellationToken)
{
return _inner.FlushAsync(cancellationToken);
}
public override int Read(byte[] buffer, int offset, int count) public override int Read(byte[] buffer, int offset, int count)
{ {
int read = _inner.Read(buffer, offset, count); int read = _inner.Read(buffer, offset, count);

View File

@ -117,15 +117,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
public override void Flush() public override void Flush()
{ {
// No-op since writes are immediate. _output.Flush();
} }
public override Task FlushAsync(CancellationToken cancellationToken) public override Task FlushAsync(CancellationToken cancellationToken)
{ {
// No-op since writes are immediate. return _output.FlushAsync(cancellationToken);
return TaskCache.CompletedTask;
} }
private ValueTask<int> ReadAsync(ArraySegment<byte> buffer) private ValueTask<int> ReadAsync(ArraySegment<byte> buffer)
{ {
return _input.ReadAsync(buffer.Array, buffer.Offset, buffer.Count); return _input.ReadAsync(buffer.Array, buffer.Offset, buffer.Count);

View File

@ -8,7 +8,6 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
{ {
@ -114,14 +113,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
end.Block.Pool.Return(end.Block); end.Block.Pool.Return(end.Block);
} }
// Flush no-ops. We rely on connection filter streams to auto-flush.
public void Flush() public void Flush()
{ {
_outputStream.Flush();
} }
public Task FlushAsync(CancellationToken cancellationToken) public Task FlushAsync(CancellationToken cancellationToken)
{ {
return TaskCache.CompletedTask; return _outputStream.FlushAsync(cancellationToken);
} }
} }
} }

View File

@ -186,7 +186,12 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
public override void Flush() public override void Flush()
{ {
// No-op _innerStream.Flush();
}
public override Task FlushAsync(CancellationToken cancellationToken)
{
return _innerStream.FlushAsync(cancellationToken);
} }
public override int Read(byte[] buffer, int offset, int count) public override int Read(byte[] buffer, int offset, int count)