summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-13 15:12:07 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-13 15:12:07 +0200
commit99e17f6131bf0eb1762ddc13766b41fcd1942a29 (patch)
tree78d8b7d5fd9129ce2ca5989187c7243917863398
parentf0398c87d9bd472d23b6dfce6943d97fbf9fabf5 (diff)
Fix timeout issue on drag&drop uploads (#1489170)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0b9712639..98da92939 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix timeout issue on drag&drop uploads (#1489170)
- Fix thread cache syncronization/validation (#1489028)
- Fix default sorting of threaded list when THREAD=REFS isn't supported
- Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
diff --git a/program/js/app.js b/program/js/app.js
index 885584b50..0dea59216 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6433,6 +6433,7 @@ function rcube_webmail()
url: ref.url(ref.env.filedrop.action||'upload', { _id:ref.env.compose_id||ref.env.cid||'', _uploadid:ts, _remote:1 }),
contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
processData: false,
+ timeout: 0, // disable default timeout set in ajaxSetup()
data: formdata || multipart,
headers: {'X-Roundcube-Request': ref.env.request_token},
beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },