Skip to content

Commit f6205af

Browse files
committed
fix(core): wrong Content-Type when using reqwest's multipart, ref #4312
1 parent 8ce5b76 commit f6205af

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.changes/fix-reqwest-multipart.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch
3+
---
4+
5+
Fixes the `Content-Type` header value when sending multipart requests using the `reqwest-client` feature.

core/tauri/src/api/http.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl Client {
238238
/// Executes an HTTP request
239239
///
240240
/// # Examples
241-
pub async fn send(&self, request: HttpRequestBuilder) -> crate::api::Result<Response> {
241+
pub async fn send(&self, mut request: HttpRequestBuilder) -> crate::api::Result<Response> {
242242
let method = Method::from_bytes(request.method.to_uppercase().as_bytes())?;
243243

244244
let mut request_builder = self.0.request(method, request.url.as_str());
@@ -260,7 +260,7 @@ impl Client {
260260
#[allow(unused_variables)]
261261
fn send_form(
262262
request_builder: reqwest::RequestBuilder,
263-
headers: &Option<HeaderMap>,
263+
headers: &mut Option<HeaderMap>,
264264
form_body: FormBody,
265265
) -> crate::api::Result<reqwest::RequestBuilder> {
266266
#[cfg(feature = "http-multipart")]
@@ -271,6 +271,8 @@ impl Client {
271271
.map(|v| v.as_bytes()),
272272
Some(b"multipart/form-data")
273273
) {
274+
// the Content-Type header will be set by reqwest in the `.multipart` call
275+
headers.as_mut().map(|h| h.0.remove("content-type"));
274276
let mut multipart = reqwest::multipart::Form::new();
275277

276278
for (name, part) in form_body.0 {
@@ -311,7 +313,7 @@ impl Client {
311313
}
312314
Ok(request_builder.form(&form))
313315
}
314-
send_form(request_builder, &request.headers, form_body)?
316+
send_form(request_builder, &mut request.headers, form_body)?
315317
}
316318
};
317319
}

0 commit comments

Comments
 (0)