From 36d5e8a7c3296ba8ab84673324bf8c1b80a9d57d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 13 Jun 2013 15:12:07 +0200 Subject: Fix timeout issue on drag&drop uploads (#1489170) Conflicts: CHANGELOG --- CHANGELOG | 1 + program/js/app.js | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a882c3967..0e3ed5061 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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; }, -- cgit v1.2.3