summaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/terminal
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2008-03-27 08:56:34 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2008-03-27 08:56:34 +0000
commitcf568c315d0f82d09c3e39b4d89ee6113422a796 (patch)
treed4a3d71d8b1e1c095c0a314e5c4fdea6473a5340 /src/com/itmill/toolkit/terminal
parent608aa93c0d099e1dc64acdac86fd9d1a8be09430 (diff)
downloadvaadin-framework-cf568c315d0f82d09c3e39b4d89ee6113422a796.tar.gz
vaadin-framework-cf568c315d0f82d09c3e39b4d89ee6113422a796.zip
Fixes #1514: Add src-attribute for __gwt_historyFrame IFRAME-element to prevent IE6 security issues when using SSL
svn changeset:4088/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/terminal')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index db2ebbe482..573c0b43c1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -567,7 +567,7 @@ public class ApplicationServlet extends HttpServlet {
outWriter.print("for(;;);[{\"changes\":[], \"meta\" : {"
+ "\"appError\": {" + "\"caption\":\"" + caption + "\","
+ "\"message\" : \"<br />Please click <a href=\\\"\\\""
- + "onclick=\\\"Javascript: window.location.reload()\\\" >"
+ + "onclick=\\\"javascript:window.location.reload()\\\" >"
+ "here</a> to restart your application.<br />"
+ "You can also click your browser's refresh button.\""
+ "}}, \"resources\": {}, \"locales\":[]}]");
@@ -723,7 +723,7 @@ public class ApplicationServlet extends HttpServlet {
page
.write("</head>\n<body class=\"i-generated-body\">\n"
- + " <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\"></iframe>\n"
+ + " <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\" src=\"javascript:false\"></iframe>\n"
+ " <div id=\"itmill-ajax-window\" style=\"position: absolute;top:0;left:0;width:100%;height:100%;border:0;margin:0\"></div>"
+ " </body>\n" + "</html>\n");