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

Merge pull request #2925 from dotnet-maestro-bot/merge/release/2.2-to-master 

[automated] Merge branch 'release/2.2' => 'master'
This commit is contained in:
Chris Ross 2018-09-14 11:30:52 -07:00 committed by GitHub
parent d2616ffb31 55e5e56422
commit ad31c2446b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kestrel.Core/Internal/Http2/Http2OutputProducer.cs
View File

@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
( (
pool: pool, pool: pool,
readerScheduler: PipeScheduler.Inline, readerScheduler: PipeScheduler.Inline,
writerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.ThreadPool,
pauseWriterThreshold: 1, pauseWriterThreshold: 1,
resumeWriterThreshold: 1, resumeWriterThreshold: 1,
useSynchronizationContext: false, useSynchronizationContext: false,

48
test/Kestrel.InMemory.FunctionalTests/Http2/Http2StreamTests.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.ExceptionServices; using System.Runtime.ExceptionServices;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections;
@ -1687,5 +1688,52 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.IsType<ConnectionAbortedException>(thrownEx.InnerException); Assert.IsType<ConnectionAbortedException>(thrownEx.InnerException);
Assert.Equal(CoreStrings.ConnectionAbortedByApplication, thrownEx.InnerException.Message); Assert.Equal(CoreStrings.ConnectionAbortedByApplication, thrownEx.InnerException.Message);
} }
// Sync writes after async writes could block the write loop if the callback is not dispatched.
// https://github.com/aspnet/KestrelHttpServer/issues/2878
[Fact]
public async Task Write_DoesNotBlockWriteLoop()
{
const int windowSize = (int)Http2PeerSettings.DefaultMaxFrameSize;
_clientSettings.InitialWindowSize = windowSize;
await InitializeConnectionAsync(async context =>
{
// Fill the flow control window to create async back pressure.
await context.Response.Body.WriteAsync(new byte[windowSize + 1], 0, windowSize + 1);
context.Response.Body.Write(new byte[1], 0, 1);
});
await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
await ExpectAsync(Http2FrameType.HEADERS,
withLength: 37,
withFlags: (byte)Http2HeadersFrameFlags.END_HEADERS,
withStreamId: 1);
await ExpectAsync(Http2FrameType.DATA,
withLength: windowSize,
withFlags: (byte)Http2DataFrameFlags.NONE,
withStreamId: 1);
await SendWindowUpdateAsync(1, 2);
await SendWindowUpdateAsync(0, 2);
// Remaining 1 byte from the first write and then the second write
await ExpectAsync(Http2FrameType.DATA,
withLength: 1,
withFlags: (byte)Http2DataFrameFlags.NONE,
withStreamId: 1);
await ExpectAsync(Http2FrameType.DATA,
withLength: 1,
withFlags: (byte)Http2DataFrameFlags.NONE,
withStreamId: 1);
await ExpectAsync(Http2FrameType.DATA,
withLength: 0,
withFlags: (byte)Http2DataFrameFlags.END_STREAM,
withStreamId: 1);
await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
}
} }
} }