fix(android): skip duplicated Content-Type/Content-Length header to fix tauri-apps/tauri#8857 (#1360)

Steve-xmh · web-flow · commit 170095b9a582 · 2024-09-10T17:42:27.000+03:00
* fix(android): skip duplicated Content-Type/Content-Length header to fix tauri-apps/tauri#8857 * fix(android): added comment and change log
diff --git a/.changes/fix-android-headers-skip-content-type-and-content-length.md b/.changes/fix-android-headers-skip-content-type-and-content-length.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+Fix web resource loading in android binding by skip duplicate Content-Type/Content-Length headers.
diff --git a/src/android/binding.rs b/src/android/binding.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 use http::{
-  header::{HeaderName, HeaderValue, CONTENT_TYPE},
+  header::{HeaderName, HeaderValue, CONTENT_LENGTH, CONTENT_TYPE},
   Request,
 };
 use jni::errors::Result as JniResult;
@@ -216,6 +216,11 @@ fn handle_request(
       let response_headers = {
         let headers_map = JMap::from_env(env, &obj)?;
         for (name, value) in headers.iter() {
+          // WebResourceResponse will automatically generate Content-Type and
+          // Content-Length headers so we should skip them to avoid duplication.
+          if name == CONTENT_TYPE || name == CONTENT_LENGTH {
+            continue;
+          }
           let key = env.new_string(name)?;
           let value = env.new_string(value.to_str().unwrap_or_default())?;
           headers_map.put(env, &key, &value)?;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"wry": patch
 +---
++
 +Fix web resource loading in android binding by skip duplicate Content-Type/Content-Length headers.