Skip to content

SSE now works with preceding channel handlers such as SSL #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NiteshKant merged 2 commits into from
Jul 23, 2015
Merged

SSE now works with preceding channel handlers such as SSL #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6536d9a
SSE now works with preceding channel handlers such as SSL
johanhaleby Jul 19, 2015
52b44a8
Removed chunked encdding if-statement since it's not needed
johanhaleby Jul 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions rxnetty/src/main/java/io/reactivex/netty/protocol/http/sse/SSEInboundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg)
ctx.channel().attr(ClientRequestResponseConverter.DISCARD_CONNECTION).set(true); // SSE traffic should always discard connection on close.

ChannelPipeline pipeline = ctx.channel().pipeline();
if (!HttpHeaders.isTransferEncodingChunked((HttpResponse) msg)) {
pipeline.addFirst(SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
/*
* If there are buffered messages in the previous handler at the time this message is read, we would
* not be able to convert the content into an SseEvent. For this reason, we also add the decoder after
* this handler, so that we can handle the buffered messages.
* See the class level javadoc for more details.
*/
pipeline.addAfter(NAME, SSE_DECODER_POST_INBOUND_HANDLER, new ServerSentEventDecoder());
} else {
pipeline.addAfter(NAME, SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
}
pipeline.addAfter(NAME, SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
ctx.fireChannelRead(msg);
} else if (msg instanceof LastHttpContent) {
LastHttpContent lastHttpContent = (LastHttpContent) msg;
Expand Down
13 changes: 1 addition & 12 deletions rxnetty/src/main/java/io/reactivex/netty/protocol/http/sse/SseChannelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg)
ctx.channel().attr(ClientRequestResponseConverter.DISCARD_CONNECTION).set(true); // SSE traffic should always discard connection on close.

ChannelPipeline pipeline = ctx.channel().pipeline();
if (!HttpHeaders.isTransferEncodingChunked((HttpResponse) msg)) {
pipeline.addFirst(SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
/*
* If there are buffered messages in the previous handler at the time this message is read, we would
* not be able to convert the content into an SseEvent. For this reason, we also add the decoder after
* this handler, so that we can handle the buffered messages.
* See the class level javadoc for more details.
*/
pipeline.addAfter(NAME, SSE_DECODER_POST_INBOUND_HANDLER, new ServerSentEventDecoder());
} else {
pipeline.addAfter(NAME, SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
}
pipeline.addAfter(NAME, SSE_DECODER_HANDLER_NAME, new ServerSentEventDecoder());
ctx.fireChannelRead(msg);
} else if (msg instanceof LastHttpContent) {
LastHttpContent lastHttpContent = (LastHttpContent) msg;
Expand Down