Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Send full response for unsupported websocket versions
Motivation: WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse does not send a LastHttpContent, nor does it flush, and it doesn't send a content length. Modifications: Changed sendUnsupportedVersionResponse to send FullHttpResponse, to writeAndFlush, and to set a content length of 0. Also added a test for this method. Result: Upstream handlers will be able to determine the end of the response, the response will actually get written to the client, and the client will be able to determine the end of the response.
- Loading branch information
1 parent
9747ffe
commit b958263
Showing
2 changed files
with
57 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...est/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactoryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright 2015 The Netty Project | ||
* | ||
* The Netty Project licenses this file to you under the Apache License, | ||
* version 2.0 (the "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at: | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package io.netty.handler.codec.http.websocketx; | ||
|
||
import io.netty.channel.embedded.EmbeddedChannel; | ||
import io.netty.handler.codec.http.FullHttpResponse; | ||
import io.netty.handler.codec.http.HttpHeaderNames; | ||
import io.netty.handler.codec.http.HttpHeaderUtil; | ||
import io.netty.handler.codec.http.HttpResponseStatus; | ||
import io.netty.util.ReferenceCountUtil; | ||
import org.junit.Test; | ||
|
||
import static org.junit.Assert.*; | ||
|
||
public class WebSocketServerHandshakerFactoryTest { | ||
|
||
@Test | ||
public void testUnsupportedVersion() throws Exception { | ||
EmbeddedChannel ch = new EmbeddedChannel(); | ||
WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ch); | ||
ch.runPendingTasks(); | ||
Object msg = ch.readOutbound(); | ||
|
||
if (!(msg instanceof FullHttpResponse)) { | ||
fail("Got wrong response " + msg); | ||
} | ||
FullHttpResponse response = (FullHttpResponse) msg; | ||
|
||
assertEquals(HttpResponseStatus.UPGRADE_REQUIRED, response.status()); | ||
assertEquals(WebSocketVersion.V13.toHttpHeaderValue(), | ||
response.headers().get(HttpHeaderNames.SEC_WEBSOCKET_VERSION)); | ||
assertTrue(HttpHeaderUtil.isContentLengthSet(response)); | ||
assertEquals(0, HttpHeaderUtil.getContentLength(response)); | ||
|
||
ReferenceCountUtil.release(response); | ||
assertFalse(ch.finish()); | ||
} | ||
} |