You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/08/14 02:28:54 UTC
git commit: apply patch https://reviews.apache.org/r/6572/
Updated Branches:
refs/heads/master b3760350f -> 04bf1a33c
apply patch https://reviews.apache.org/r/6572/
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/04bf1a33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/04bf1a33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/04bf1a33
Branch: refs/heads/master
Commit: 04bf1a33c6d704770bd23d368d75d675aefaf2ec
Parents: b376035
Author: Kelven Yang <ke...@citrix.com>
Authored: Mon Aug 13 17:28:22 2012 -0700
Committer: Kelven Yang <ke...@citrix.com>
Committed: Mon Aug 13 17:28:41 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/04bf1a33/server/src/com/cloud/servlet/ConsoleProxyServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index a052ce2..a8519fe 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -336,7 +336,7 @@ public class ConsoleProxyServlet extends HttpServlet {
param.setClientTunnelSession(parsedHostInfo.third());
}
- sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
+ sb.append("/ajaximg?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
sb.append("&w=").append(w).append("&h=").append(h);
if(s_logger.isDebugEnabled()) {