andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Propagate h2c upgrade success event to the next handler before removing source codec

Browse Source 
Motivation:

When upgrading h2c, I found that sometimes both of http2 settings frame and http response message was arrived before receiving upgrade success event. It was because ByteToMessageDecoder propagated its internally buffered message to the next handler when removing itself from pipeline.(refer to ByteToMessageDecoder#handlerRemoved)
I think it's better to propagate upgrade success event when handling 101 switching protocol response.

Modifications:

Upgrade success event will be propagated before removing source codec.

Result:

It guarantees that upgrade success event will be arrived first at the next handler.
This commit is contained in:
Hyangtack Lee 2016-04-07 22:00:52 +09:00 committed by Norman Maurer
parent e053b96b5c
commit 24254b159f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
View File

@ -231,11 +231,14 @@ public class HttpClientUpgradeHandler extends HttpObjectAggregator implements Ch
// Upgrade to the new protocol. // Upgrade to the new protocol.
sourceCodec.prepareUpgradeFrom(ctx); sourceCodec.prepareUpgradeFrom(ctx);
upgradeCodec.upgradeTo(ctx, response); upgradeCodec.upgradeTo(ctx, response);
sourceCodec.upgradeFrom(ctx);
// Notify that the upgrade to the new protocol completed successfully. // Notify that the upgrade to the new protocol completed successfully.
ctx.fireUserEventTriggered(UpgradeEvent.UPGRADE_SUCCESSFUL); ctx.fireUserEventTriggered(UpgradeEvent.UPGRADE_SUCCESSFUL);
// We guarantee UPGRADE_SUCCESSFUL event will be arrived at the next handler
// before http2 setting frame and http response.
sourceCodec.upgradeFrom(ctx);
// We switched protocols, so we're done with the upgrade response. // We switched protocols, so we're done with the upgrade response.
// Release it and clear it from the output. // Release it and clear it from the output.
response.release(); response.release();