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/01/24 19:40:50 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-172: Do not
send potentially-invalid "sync" as a keep-alive. Use "nop" instead.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 005f6153f -> 8de93ad4e
GUACAMOLE-172: Do not send potentially-invalid "sync" as a keep-alive. Use "nop" instead.
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/41881be9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/41881be9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/41881be9
Branch: refs/heads/master
Commit: 41881be909ee933d80f1e22fed6b14e0d912ce8b
Parents: 005f615
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jan 15 14:00:20 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jan 24 11:01:45 2017 -0800
----------------------------------------------------------------------
guacamole-common-js/src/main/webapp/modules/Client.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/41881be9/guacamole-common-js/src/main/webapp/modules/Client.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
index 45ebfe3..1eb21f3 100644
--- a/guacamole-common-js/src/main/webapp/modules/Client.js
+++ b/guacamole-common-js/src/main/webapp/modules/Client.js
@@ -1346,7 +1346,7 @@ Guacamole.Client = function(tunnel) {
// Ping every 5 seconds (ensure connection alive)
pingInterval = window.setInterval(function() {
- tunnel.sendMessage("sync", currentTimestamp);
+ tunnel.sendMessage("nop");
}, 5000);
setState(STATE_WAITING);
[2/2] incubator-guacamole-client git commit: GUACAMOLE-172: Merge
keep-alive ping fix.
Posted by jm...@apache.org.
GUACAMOLE-172: Merge keep-alive ping fix.
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/8de93ad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8de93ad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8de93ad4
Branch: refs/heads/master
Commit: 8de93ad4ead886e02566dab5547c3197787c6ea7
Parents: 005f615 41881be
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jan 24 11:39:16 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jan 24 11:39:16 2017 -0800
----------------------------------------------------------------------
guacamole-common-js/src/main/webapp/modules/Client.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------