From 6a52434b12c4bb71e23be2836b727122ac3dd8d7 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 9 Mar 2012 12:42:56 -0800 Subject: [PATCH] Test for WebSocket, default to HTTP. --- guacamole/src/main/webapp/client.xhtml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml index 1a319ea11..ba9a5a43c 100644 --- a/guacamole/src/main/webapp/client.xhtml +++ b/guacamole/src/main/webapp/client.xhtml @@ -103,9 +103,13 @@ var tunnel; - // TODO: Detect WebSocket and websocket-tunnel - tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel") - //tunnel = new Guacamole.HTTPTunnel("tunnel") + // If WebSocket available, try to use it. + if (window.WebSocket) + tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel") + + // If no WebSocket, then use HTTP. + else + tunnel = new Guacamole.HTTPTunnel("tunnel") // Instantiate client var guac = new Guacamole.Client(tunnel);