You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/04/14 21:17:49 UTC

[1/2] incubator-guacamole-client git commit: GUACAMOLE-250: Ensure static downloads of Guacamole protocol data are handled as text, even if the "Content-Type" header is missing.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 8c7942c01 -> 209009cc7


GUACAMOLE-250: Ensure static downloads of Guacamole protocol data are handled as text, even if the "Content-Type" header is missing.

Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5d6c774b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5d6c774b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5d6c774b

Branch: refs/heads/master
Commit: 5d6c774be8dd39872e9e4370efb39d58e3cbe2c4
Parents: 9596801
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Apr 13 22:05:10 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Apr 14 10:31:24 2017 -0700

----------------------------------------------------------------------
 guacamole-common-js/src/main/webapp/modules/Tunnel.js | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5d6c774b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
index e520177..cc5fbbb 100644
--- a/guacamole-common-js/src/main/webapp/modules/Tunnel.js
+++ b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
@@ -1139,6 +1139,7 @@ Guacamole.StaticHTTPTunnel = function StaticHTTPTunnel(url, crossDomain) {
         xhr = new XMLHttpRequest();
         xhr.open('GET', url);
         xhr.withCredentials = !!crossDomain;
+        xhr.responseType = 'text';
         xhr.send(null);
 
         var offset = 0;


[2/2] incubator-guacamole-client git commit: GUACAMOLE-250: Merge response type fix for static protocol data download.

Posted by jm...@apache.org.
GUACAMOLE-250: Merge response type fix for static protocol data download.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/209009cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/209009cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/209009cc

Branch: refs/heads/master
Commit: 209009cc7ce1b89ef2c6a7f5bbd53b067a15f023
Parents: 8c7942c 5d6c774
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Apr 14 14:14:19 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Apr 14 14:14:19 2017 -0700

----------------------------------------------------------------------
 guacamole-common-js/src/main/webapp/modules/Tunnel.js | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------