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

HTTP/2: do not ACK PING frames received with ACK set.

This commit is contained in:
Cesar Blum Silveira 2017-09-20 18:34:54 -07:00 committed by Cesar Blum Silveira
parent 551c1ebc0b
commit bb9840a552
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Kestrel.Core/Internal/Http2/Http2Connection.cs
View File

@ -413,6 +413,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
throw new Http2ConnectionErrorException(Http2ErrorCode.FRAME_SIZE_ERROR); throw new Http2ConnectionErrorException(Http2ErrorCode.FRAME_SIZE_ERROR);
} }
if ((_incomingFrame.PingFlags & Http2PingFrameFlags.ACK) == Http2PingFrameFlags.ACK)
{
return Task.CompletedTask;
}
return _frameWriter.WritePingAsync(Http2PingFrameFlags.ACK, _incomingFrame.Payload); return _frameWriter.WritePingAsync(Http2PingFrameFlags.ACK, _incomingFrame.Payload);
} }

22
test/Kestrel.Core.Tests/Http2ConnectionTests.cs
View File

@ -923,11 +923,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
} }
[Fact] [Fact]
public async Task PING_Received_Sends_ACK() public async Task PING_Received_SendsACK()
{ {
await InitializeConnectionAsync(_noopApplication); await InitializeConnectionAsync(_noopApplication);
await SendPingAsync(); await SendPingAsync(Http2PingFrameFlags.NONE);
await ExpectAsync(Http2FrameType.PING, await ExpectAsync(Http2FrameType.PING,
withLength: 8, withLength: 8,
withFlags: (byte)Http2PingFrameFlags.ACK, withFlags: (byte)Http2PingFrameFlags.ACK,
@ -936,13 +936,23 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
await StopConnectionAsync(expectedLastStreamId: 0, ignoreNonGoAwayFrames: false); await StopConnectionAsync(expectedLastStreamId: 0, ignoreNonGoAwayFrames: false);
} }
[Fact]
public async Task PING_Received_WithACK_DoesNotSendACK()
{
await InitializeConnectionAsync(_noopApplication);
await SendPingAsync(Http2PingFrameFlags.ACK);
await StopConnectionAsync(expectedLastStreamId: 0, ignoreNonGoAwayFrames: false);
}
[Fact] [Fact]
public async Task PING_Received_InterleavedWithHeaders_ConnectionError() public async Task PING_Received_InterleavedWithHeaders_ConnectionError()
{ {
await InitializeConnectionAsync(_noopApplication); await InitializeConnectionAsync(_noopApplication);
await SendHeadersAsync(1, Http2HeadersFrameFlags.NONE, _browserRequestHeaders); await SendHeadersAsync(1, Http2HeadersFrameFlags.NONE, _browserRequestHeaders);
await SendPingAsync(); await SendPingAsync(Http2PingFrameFlags.NONE);
await WaitForConnectionErrorAsync(expectedLastStreamId: 0, expectedErrorCode: Http2ErrorCode.PROTOCOL_ERROR, ignoreNonGoAwayFrames: false); await WaitForConnectionErrorAsync(expectedLastStreamId: 0, expectedErrorCode: Http2ErrorCode.PROTOCOL_ERROR, ignoreNonGoAwayFrames: false);
} }
@ -1160,7 +1170,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
await SendUnknownFrameTypeAsync(streamId: 1); await SendUnknownFrameTypeAsync(streamId: 1);
// Check that the connection is still alive // Check that the connection is still alive
await SendPingAsync(); await SendPingAsync(Http2PingFrameFlags.NONE);
await ExpectAsync(Http2FrameType.PING, await ExpectAsync(Http2FrameType.PING,
withLength: 8, withLength: 8,
withFlags: (byte)Http2PingFrameFlags.ACK, withFlags: (byte)Http2PingFrameFlags.ACK,
@ -1502,10 +1512,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
return SendAsync(frame.Raw); return SendAsync(frame.Raw);
} }
private Task SendPingAsync() private Task SendPingAsync(Http2PingFrameFlags flags)
{ {
var pingFrame = new Http2Frame(); var pingFrame = new Http2Frame();
pingFrame.PreparePing(Http2PingFrameFlags.NONE); pingFrame.PreparePing(flags);
return SendAsync(pingFrame.Raw); return SendAsync(pingFrame.Raw);
} }