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

Do not use X-Guacamole-Error-Message - use status code only.

Browse Source
This commit is contained in:
Michael Jumper
2012-03-24 16:57:58 -07:00
parent 8ad557cf31
commit e6249fbf5b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
guacamole-common-js/src/main/resources/tunnel.js
View File

@@ -203,13 +203,22 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
} }
function getHTTPTunnelErrorMessage(xmlhttprequest) {
var status = xmlhttprequest.status;
if (status >= 200 && status <= 299) return "Success";
if (status >= 400 && status <= 499) return "Unauthorized";
if (status >= 500 && status <= 599) return "Connection lost";
return "Unknown error";
}
function handleHTTPTunnelError(xmlhttprequest) { function handleHTTPTunnelError(xmlhttprequest) {
// Get error message (if any) // Get error message
var message = xmlhttprequest.getResponseHeader("X-Guacamole-Error-Message"); var message = getHTTPTunnelErrorMessage(xmlhttprequest);
if (!message)
message = "Internal server error";
// Call error handler // Call error handler
if (tunnel.onerror) tunnel.onerror(message); if (tunnel.onerror) tunnel.onerror(message);
@@ -424,13 +433,8 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
// If failure, throw error // If failure, throw error
if (connect_xmlhttprequest.status != 200) { if (connect_xmlhttprequest.status != 200) {
var message = getHTTPTunnelErrorMessage(connect_xmlhttprequest);
var message = connect_xmlhttprequest.getResponseHeader("X-Guacamole-Error-Message");
if (!message)
message = "Internal error";
throw new Error(message); throw new Error(message);
} }
// Get UUID from response // Get UUID from response