2 files changed, 22 insertions, 3 deletions

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 7d6bde6e0f9..f3a39e5861a 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -269,8 +269,12 @@ OC.FileUpload.prototype = {
 			&& this.getFile().size > this.uploader.fileUploadParam.maxChunkSize
 		) {
 			data.isChunked = true;
+			var headers = {
+				Destination: this.uploader.davClient._buildUrl(this.getTargetDestination())
+			};
+
 			chunkFolderPromise = this.uploader.davClient.createDirectory(
-				'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
+				'uploads/' + OC.getCurrentUser().uid + '/' + this.getId(), headers
 			);
 			// TODO: if fails, it means same id already existed, need to retry
 		} else {
@@ -309,17 +313,22 @@ OC.FileUpload.prototype = {
 		}
 		if (size) {
 			headers['OC-Total-Length'] = size;
-
 		}
+		headers['Destination'] = this.uploader.davClient._buildUrl(this.getTargetDestination());
 
 		return this.uploader.davClient.move(
 			'uploads/' + uid + '/' + this.getId() + '/.file',
-			'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
+			this.getTargetDestination(),
 			true,
 			headers
 		);
 	},
 
+	getTargetDestination: function() {
+		var uid = OC.getCurrentUser().uid;
+		return 'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName());
+	},
+
 	_deleteChunkFolder: function() {
 		// delete transfer directory for this upload
 		this.uploader.davClient.remove(
@@ -1326,6 +1335,10 @@ OC.Uploader.prototype = _.extend({
 					}
 					var range = data.contentRange.split(' ')[1];
 					var chunkId = range.split('/')[0].split('-')[0];
+					// Use a numeric chunk id and set the Destination header on all request for ChunkingV2
+					chunkId = Math.ceil((data.chunkSize+Number(chunkId)) / upload.uploader.fileUploadParam.maxChunkSize);
+					data.headers['Destination'] = self.davClient._buildUrl(upload.getTargetDestination());
+
 					data.url = OC.getRootPath() +
 						'/remote.php/dav/uploads' +
 						'/' + OC.getCurrentUser().uid +
diff --git a/apps/files/js/jquery.fileupload.js b/apps/files/js/jquery.fileupload.js
index 9b382ccae39..da516b15e1c 100644
--- a/apps/files/js/jquery.fileupload.js
+++ b/apps/files/js/jquery.fileupload.js
@@ -733,6 +733,12 @@
                 promise = dfd.promise(),
                 jqXHR,
                 upload;
+
+            // Dynamically adjust the chunk size for Chunking V2 to fit into the 10000 chunk limit
+            if (file.size/mcs > 10000) {
+                mcs = Math.ceil(file.size/10000)
+            }
+
             if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
                     options.data) {
                 return false;