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:35:57 +0100
commit92cb7f56f38564d62c79a6c67b8b99248a3baa74 (patch)
tree2bcbc4838c845a0d347b8d82474649d066b89d41
parent9c299eb9e695810272ed90c35993d34157d0d6ae (diff)
Fix possible HTTP DoS on error in keep-alive requests (#1488782)
-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 ff33fd99f..4164c1783 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix possible HTTP DoS on error in keep-alive requests (#1488782)
- Add option to disable saving sent mail in Sent folder - no_save_sent_messages (#1488686)
- Fix handling dont_override with message_sort_col and message_sort_order settings (#1488760)
- Fix HTML part detection in messages with attachments (#1488769)
diff --git a/program/js/app.js b/program/js/app.js
index 1aa008295..c151a1012 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6273,9 +6273,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