summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-03-22 07:49:43 +0000
committerthomascube <thomas@roundcube.net>2011-03-22 07:49:43 +0000
commitec045b0a24bbb0de2b203961b453a9f5bd640f34 (patch)
tree5e54169b90512bd0a4dda9fc517f21eb518540eb /program/js
parenta8d7c659f1b343d2f0d6c954fcd3e0688e512736 (diff)
Revert r4609 and use stateless request tokens; no need to save them in session and thus no keep-alive necessary; fixes #1487829
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index ebbbae24b..384f45f80 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5431,7 +5431,7 @@ function rcube_webmail()
if (this.env.keep_alive && !this.env.framed && this.task == 'mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.env.keep_alive && !this.env.framed && this.env.action != 'print')
+ else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};