fix(azure): multi-part upload to S3 fails on Edge >= 15

fixes #1852
FineUploader · Jun 27, 2017 · a060e50 · a060e50
1 parent fc5923f
commit a060e50
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/client/js/s3/s3.xhr.upload.handler.js b/client/js/s3/s3.xhr.upload.handler.js
@@ -115,10 +115,20 @@ qq.s3.XhrUploadHandler = function(spec, proxy) {
                         upload.track(id, xhr, chunkIdx).then(promise.success, promise.failure);
                         xhr.open("PUT", url, true);
 
+                        var hasContentType = false;
                         qq.each(headers, function(name, val) {
+                            if (name === "Content-Type") {
+                                hasContentType = true;
+                            }
+
                             xhr.setRequestHeader(name, val);
                         });
 
+                        // Workaround for IE Edge
+                        if (!hasContentType) {
+                            xhr.setRequestHeader("Content-Type", "");
+                        }
+
                         xhr.send(chunkData.blob);
                     }
                 }, function() {

diff --git a/test/static/third-party/sinon/fake_xml_http_request.js b/test/static/third-party/sinon/fake_xml_http_request.js
@@ -308,7 +308,7 @@
         send: function send(data) {
             verifyState(this);
 
-            if (!/^(get|head)$/i.test(this.method)) {
+            if (!/^(get|head|put)$/i.test(this.method)) {
                 if (this.requestHeaders["Content-Type"]) {
                     var value = this.requestHeaders["Content-Type"].split(";");
                     this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";

diff --git a/test/unit/s3/chunked-uploads.js b/test/unit/s3/chunked-uploads.js
@@ -161,6 +161,8 @@ if (qqtest.canDownloadFileAsBlob) {
                             assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=1&uploadId=123");
                             assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
 
+                            assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                             var authParts = uploadPartRequest.requestHeaders.Authorization.split(";");
                             assert.equal(authParts.length, 3);
                             assert.equal(authParts[0].split(",")[1], "SignedHeaders=host");
@@ -189,6 +191,8 @@ if (qqtest.canDownloadFileAsBlob) {
                                 assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=2&uploadId=123");
                                 assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
 
+                                assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                                 var authParts = uploadPartRequest.requestHeaders.Authorization.split(";");
                                 assert.equal(authParts.length, 3);
                                 assert.equal(authParts[0].split(",")[1], "SignedHeaders=host");
@@ -343,6 +347,9 @@ if (qqtest.canDownloadFileAsBlob) {
                     assert.equal(uploadPartRequest.method, "PUT");
                     assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=1&uploadId=123");
                     assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
+
+                    assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                     assert.equal(uploadPartRequest.requestHeaders.Authorization, "AWS " + testAccessKey + ":thesignature");
                     uploadPartRequest.respond(200, {ETag: "etag1"}, null);
 
@@ -364,6 +371,9 @@ if (qqtest.canDownloadFileAsBlob) {
                     assert.equal(uploadPartRequest.method, "PUT");
                     assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=2&uploadId=123");
                     assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
+
+                    assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                     assert.equal(uploadPartRequest.requestHeaders.Authorization, "AWS " + testAccessKey + ":thesignature");
                     uploadPartRequest.respond(200, {ETag: "etag2"}, null);
 
@@ -800,6 +810,9 @@ if (qqtest.canDownloadFileAsBlob) {
                     assert.equal(uploadPartRequest.method, "PUT");
                     assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=1&uploadId=123");
                     assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
+
+                    assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                     assert.equal(uploadPartRequest.requestHeaders.Authorization.indexOf("AWS " + testAccessKey + ":"), 0, "Upload part 1 request Authorization header is invalid");
                     uploadPartRequest.respond(200, {ETag: "etag1"}, null);
 
@@ -809,6 +822,9 @@ if (qqtest.canDownloadFileAsBlob) {
                     assert.equal(uploadPartRequest.method, "PUT");
                     assert.equal(uploadPartRequest.url, testS3Endpoint + "/" + uploader.getKey(0) + "?partNumber=2&uploadId=123");
                     assert.ok(uploadPartRequest.requestHeaders["x-amz-date"]);
+
+                    assert.equal(uploadPartRequest.requestHeaders["Content-Type"], "");
+
                     assert.equal(uploadPartRequest.requestHeaders.Authorization.indexOf("AWS " + testAccessKey + ":"), 0, "Upload part 2 request Authorization header is invalid");
                     uploadPartRequest.respond(200, {ETag: "etag2"}, null);