Updated Branches: refs/heads/vpc af8e6f58f -> 39e9e7092
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/39e9e709 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/39e9e709 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/39e9e709 Branch: refs/heads/vpc Commit: 39e9e7092b10f8262e8db09bbbf4d34e23de181e Parents: af8e6f5 Author: Kelven Yang <[email protected]> Authored: Mon Aug 13 17:28:22 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Mon Aug 13 17:29:40 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/39e9e709/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()) {
