fix(formdata): fixed content-type header normalization for non-standard browser environments; (#6056)

DigitalBrainJS · web-flow · commit dd465ab22bbf · 2023-11-07T22:21:19.000+02:00
diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js
@@ -66,11 +66,10 @@ export default isXHRAdapterSupported && function (config) {
     if (utils.isFormData(requestData)) {
       if (platform.hasStandardBrowserEnv || platform.hasStandardBrowserWebWorkerEnv) {
         requestHeaders.setContentType(false); // Let the browser set it
-      } else if(!requestHeaders.getContentType(/^\s*multipart\/form-data/)){
-        requestHeaders.setContentType('multipart/form-data'); // mobile/desktop app frameworks
-      } else if(utils.isString(contentType = requestHeaders.getContentType())){
+      } else if ((contentType = requestHeaders.getContentType()) !== false) {
         // fix semicolon duplication issue for ReactNative FormData implementation
-        requestHeaders.setContentType(contentType.replace(/^\s*(multipart\/form-data);+/, '$1'))
+        const [type, ...tokens] = contentType ? contentType.split(';').map(token => token.trim()).filter(Boolean) : [];
+        requestHeaders.setContentType([type || 'multipart/form-data', ...tokens].join('; '));
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,10 @@ export default isXHRAdapterSupported && function (config) {`
`66`	`66`	`if (utils.isFormData(requestData)) {`
`67`	`67`	`if (platform.hasStandardBrowserEnv \|\| platform.hasStandardBrowserWebWorkerEnv) {`
`68`	`68`	`requestHeaders.setContentType(false); // Let the browser set it`
`69`		`- } else if(!requestHeaders.getContentType(/^\s*multipart\/form-data/)){`
`70`		`- requestHeaders.setContentType('multipart/form-data'); // mobile/desktop app frameworks`
`71`		`- } else if(utils.isString(contentType = requestHeaders.getContentType())){`
	`69`	`+ } else if ((contentType = requestHeaders.getContentType()) !== false) {`
`72`	`70`	`// fix semicolon duplication issue for ReactNative FormData implementation`
`73`		`- requestHeaders.setContentType(contentType.replace(/^\s*(multipart\/form-data);+/, '$1'))`
	`71`	`+ const [type, ...tokens] = contentType ? contentType.split(';').map(token => token.trim()).filter(Boolean) : [];`
	`72`	`+ requestHeaders.setContentType([type \|\| 'multipart/form-data', ...tokens].join('; '));`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`