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

Fix a problem where web socket examples do not work

Browse Source 
- Fix wrong class names in run-example.sh
- Fix incorrect web socket url generation
This commit is contained in:
Trustin Lee 2014-05-23 14:35:24 +09:00
parent 500ba1c724
commit 95c1013a34
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run-example.sh
View File

@ -12,8 +12,8 @@ EXAMPLE_MAP=(
'http-helloworld-server:org.jboss.netty.example.http.helloworld.HttpHelloWorldServer'
'http-upload-client:org.jboss.netty.example.http.upload.HttpUploadClient'
'http-upload-server:org.jboss.netty.example.http.upload.HttpUploadServer'
'websocket-client:org.jboss.netty.example.websocketx.client.WebSocketClient'
'websocket-server:org.jboss.netty.example.websocketx.server.WebSocketServer'
'websocket-client:org.jboss.netty.example.http.websocketx.client.WebSocketClient'
'websocket-server:org.jboss.netty.example.http.websocketx.server.WebSocketServer'
'localtime-client:org.jboss.netty.example.localtime.LocalTimeClient'
'localtime-server:org.jboss.netty.example.localtime.LocalTimeServer'
'objectecho-client:org.jboss.netty.example.objectecho.ObjectEchoClient'

7
src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java
View File

@ -139,6 +139,11 @@ public class WebSocketServerHandler extends SimpleChannelUpstreamHandler {
}
private static String getWebSocketLocation(HttpRequest req) {
return "ws://" + req.headers().get(HOST) + WEBSOCKET_PATH;
String location = req.headers().get(HOST) + WEBSOCKET_PATH;
if (WebSocketServer.SSL) {
return "wss://" + location;
} else {
return "ws://" + location;
}
}
}