fix: to #50200336 修复uploadPart无法传递headers参数的问题

ali-sdk · Jun 7, 2023 · 5c9f71e · 5c9f71e
1 parent 12fcfd1
commit 5c9f71e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/lib/browser/managed-upload.js b/lib/browser/managed-upload.js
@@ -141,10 +141,7 @@ proto._resumeMultipart = async function _resumeMultipart(checkpoint, options) {
 
           let result;
           try {
-            result = await self._uploadPart(name, uploadId, partNo, data, {
-              timeout: options.timeout,
-              disabledMD5: options.disabledMD5
-            });
+            result = await self._uploadPart(name, uploadId, partNo, data, options);
           } catch (error) {
             if (error.status === 404) {
               throw self._makeAbortEvent();

diff --git a/lib/common/multipart.js b/lib/common/multipart.js
@@ -235,7 +235,9 @@ proto._uploadPart = async function _uploadPart(name, uploadId, partNo, data, opt
   options = options || {};
   const opt = {};
   copy(options).to(opt);
+  opt.headers = opt.headers || {};
   opt.headers = {
+    ...opt.headers,
     'Content-Length': data.size
   };
 

diff --git a/lib/managed-upload.js b/lib/managed-upload.js
@@ -149,9 +149,7 @@ proto._resumeMultipart = async function _resumeMultipart(checkpoint, options) {
 
             let result;
             try {
-              result = await self._uploadPart(name, uploadId, partNo, data, {
-                timeout: options.timeout
-              });
+              result = await self._uploadPart(name, uploadId, partNo, data, options);
             } catch (error) {
               removeStreamFromMultipartUploadStreams();
               if (error.status === 404) {