safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 14:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly select "guacamole" protocol.

Browse Source
This commit is contained in:
Michael Jumper
2013-10-15 23:48:19 -07:00
parent d7986bba59
commit 2db11ea489
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/AuthenticatingWebSocketServlet.java
View File

@@ -20,6 +20,7 @@ package org.glyptodon.guacamole.net.basic.websocket.tomcat;
*/ */
import java.io.IOException; import java.io.IOException;
import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -107,6 +108,19 @@ public abstract class AuthenticatingWebSocketServlet extends WebSocketServlet {
} }
@Override
protected String selectSubProtocol(List<String> subProtocols) {
// Search for expected protocol
for (String protocol : subProtocols)
if ("guacamole".equals(protocol))
return "guacamole";
// Otherwise, fail
return null;
}
@Override @Override
public StreamInbound createWebSocketInbound(String protocol, public StreamInbound createWebSocketInbound(String protocol,
HttpServletRequest request) { HttpServletRequest request) {