Merge pull request #3399 from Herst/patch-1

XHR timeout disabled is required for file uploads.
blueimp · Jun 1, 2015 · 0b6c3b7 · 0b6c3b7
2 parents 7d46990 + 81f5f9b
commit 0b6c3b7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -277,7 +277,8 @@
             // The following are jQuery ajax settings required for the file uploads:
             processData: false,
             contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
         },
 
         // A list of options that require reinitializing event listeners and/or