summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-31 09:35:57 +0100
committerAleksander Machniak <alec@alec.pl>2012-10-31 09:37:04 +0100
commit752eedd9647468aa40028f5e73b80adb88957b34 (patch)
tree49f111e103a48390db725d0c613126274b5b2797
parent72e7eb826ddb1c2e38b6f727e26170708b5976e0 (diff)
Fix possible HTTP DoS on error in keep-alive requests (#1488782)
Conflicts: CHANGELOG
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0029402ff..cc8c15252 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix possible HTTP DoS on error in keep-alive requests (#1488782)
- Fix compatybility with MDB2 2.5.0b4 (#1488779)
- Fix a bug where saving a message in INBOX wasn't possible
- Fix HTML part detection in messages with attachments (#1488769)
diff --git a/program/js/app.js b/program/js/app.js
index 3335d945c..17f423eff 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6143,9 +6143,9 @@ function rcube_webmail()
// re-send keep-alive requests after 30 seconds
if (action == 'keep-alive')
- setTimeout(function(){ ref.keep_alive(); }, 30000);
+ setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
else if (action == 'check-recent')
- setTimeout(function(){ ref.check_for_recent(false); }, 30000);
+ setTimeout(function(){ ref.check_for_recent(false); ref.start_keepalive(); }, 30000);
};
// post the given form to a hidden iframe