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

Merge branch 'benaadams/flush' into dev

This commit is contained in:
Cesar Blum Silveira 2017-01-23 09:45:23 -08:00
parent 2895447cbe cac6ade7c9
commit 815db3d210
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Server.Kestrel/Adapter/Internal/RawStream.cs
View File

@ -125,6 +125,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
return _output.FlushAsync(cancellationToken); return _output.FlushAsync(cancellationToken);
} }
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);

1
src/Microsoft.AspNetCore.Server.Kestrel/Adapter/Internal/StreamSocketOutput.cs
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
{ {