safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary workaround to fix session issue - will be academic once handoff is implemented

Browse Source
This commit is contained in:
Michael Jumper
2010-09-21 19:48:03 +00:00
parent 15cc6278fa
commit 81cb2d60a3
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/client/src/net/sourceforge/guacamole/net/output/InstructionStream.java
View File

@@ -63,6 +63,11 @@ public class InstructionStream extends GuacamoleServlet {
} }
if (message == null) {
session.disconnect();
throw new GuacamoleException("Disconnected.");
}
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {
out.write("error:" + e.getMessage() + ";"); out.write("error:" + e.getMessage() + ";");

11
guacamole/client/web/javascript/guacamole.js
View File

@@ -576,14 +576,23 @@ function VNCClient(display) {
}; };
function disconnect() { function disconnect() {
// Only attempt disconnection not disconnected. // Only attempt disconnection not disconnected.
if (currentState != STATE_DISCONNECTED if (currentState != STATE_DISCONNECTED
&& currentState != STATE_DISCONNECTING) { && currentState != STATE_DISCONNECTING) {
var message = "disconnect;";
setState(STATE_DISCONNECTING); setState(STATE_DISCONNECTING);
sendMessage("disconnect;"); // End session
// Send disconnect message (synchronously... as necessary until handoff is implemented)
var disconnect_xmlhttprequest = new XMLHttpRequest();
disconnect_xmlhttprequest.open("POST", "inbound", false);
disconnect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
disconnect_xmlhttprequest.setRequestHeader("Content-length", message.length);
disconnect_xmlhttprequest.send(message);
setState(STATE_DISCONNECTED); setState(STATE_DISCONNECTED);
} }