diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-13 15:12:07 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-13 15:15:18 +0200 |
| commit | 36d5e8a7c3296ba8ab84673324bf8c1b80a9d57d (patch) | |
| tree | 9533a7995dc86fdb7cd2353a97f68ae89abf6552 | |
| parent | 35b0a75f72ef1c7c83bf2ad8ba01f6ac1a444122 (diff) | |
Fix timeout issue on drag&drop uploads (#1489170)
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix timeout issue on drag&drop uploads (#1489170) - 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) - Fix error when there's no writeable addressbook source (#1489162) diff --git a/program/js/app.js b/program/js/app.js index f990c8cf8..ed97d1916 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6493,6 +6493,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; }, |