From 99e17f6131bf0eb1762ddc13766b41fcd1942a29 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 13 Jun 2013 09:12:07 -0400
Subject: [PATCH] Fix timeout issue on drag&drop uploads (#1489170)

---
 CHANGELOG         |    1 +
 program/js/app.js |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0b97126..98da929 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 885584b..0dea592 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6433,6 +6433,7 @@
         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; },

--
Gitblit v1.9.1