Skip to content

Commit ba44211

Browse files
author
Stephane Landelle
committed
Introduce a config parameter for websocket max frame size, close AsyncHttpClient#675
1 parent 2e8b098 commit ba44211

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProviderConfig.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ public Set<Map.Entry<String, Object>> propertiesSet() {
135135

136136
private int webSocketMaxBufferSize = 128000000;
137137

138+
private int webSocketMaxFrameSize = 10 * 1024;
139+
138140
public boolean isUseDeadLockChecker() {
139141
return useDeadLockChecker;
140142
}
@@ -246,6 +248,14 @@ public int getWebSocketMaxBufferSize() {
246248
public void setWebSocketMaxBufferSize(int webSocketMaxBufferSize) {
247249
this.webSocketMaxBufferSize = webSocketMaxBufferSize;
248250
}
251+
252+
public int getWebSocketMaxFrameSize() {
253+
return webSocketMaxFrameSize;
254+
}
255+
256+
public void setWebSocketMaxFrameSize(int webSocketMaxFrameSize) {
257+
this.webSocketMaxFrameSize = webSocketMaxFrameSize;
258+
}
249259

250260
public static interface NettyWebSocketFactory {
251261
NettyWebSocket newNettyWebSocket(Channel channel, NettyAsyncHttpProviderConfig nettyConfig);

src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ public ClientBootstrap getBootstrap(String scheme, boolean useProxy, boolean use
419419
public void upgradePipelineForWebSockets(ChannelPipeline pipeline) {
420420
pipeline.addAfter(HTTP_HANDLER, WS_ENCODER_HANDLER, new WebSocket08FrameEncoder(true));
421421
pipeline.remove(HTTP_HANDLER);
422-
pipeline.addBefore(WS_PROCESSOR, WS_DECODER_HANDLER, new WebSocket08FrameDecoder(false, false, 10 * 1024));
423-
pipeline.addAfter(WS_DECODER_HANDLER, WS_FRAME_AGGREGATOR, new WebSocketFrameAggregator(10 * 1024));
422+
pipeline.addBefore(WS_PROCESSOR, WS_DECODER_HANDLER, new WebSocket08FrameDecoder(false, false, nettyConfig.getWebSocketMaxFrameSize()));
423+
pipeline.addAfter(WS_DECODER_HANDLER, WS_FRAME_AGGREGATOR, new WebSocketFrameAggregator(nettyConfig.getWebSocketMaxBufferSize()));
424424
}
425425

426426
public final Callback newDrainCallback(final NettyResponseFuture<?> future, final Channel channel, final boolean keepAlive,

0 commit comments

Comments
 (0)