diff --git a/core/src/raw/http_util/client.rs b/core/src/raw/http_util/client.rs
index 3bd7e826cd09..ea1e9ea0b8b9 100644
--- a/core/src/raw/http_util/client.rs
+++ b/core/src/raw/http_util/client.rs
@@ -26,6 +26,7 @@ use http::Request;
use http::Response;
use super::body::IncomingAsyncBody;
+use super::parse_content_encoding;
use super::parse_content_length;
use super::AsyncBody;
use crate::raw::*;
@@ -167,11 +168,13 @@ impl HttpClient {
})?;
// Get content length from header so that we can check it.
- // If the request method is HEAD, we will ignore this.
- let content_length = if is_head {
+ //
+ // - If the request method is HEAD, we will ignore content length.
+ // - If response contains content_encoding, we should omit it's content length.
+ let content_length = if is_head || parse_content_encoding(resp.headers())?.is_some() {
None
} else {
- parse_content_length(resp.headers()).expect("response content length must be valid")
+ parse_content_length(resp.headers())?
};
let mut hr = Response::builder()
diff --git a/core/src/raw/http_util/header.rs b/core/src/raw/http_util/header.rs
index f266f7c0c46d..ec28113a70dd 100644
--- a/core/src/raw/http_util/header.rs
+++ b/core/src/raw/http_util/header.rs
@@ -19,7 +19,6 @@ use base64::engine::general_purpose;
use base64::Engine;
use chrono::DateTime;
use chrono::Utc;
-use http::header::CACHE_CONTROL;
use http::header::CONTENT_DISPOSITION;
use http::header::CONTENT_LENGTH;
use http::header::CONTENT_RANGE;
@@ -27,6 +26,7 @@ use http::header::CONTENT_TYPE;
use http::header::ETAG;
use http::header::LAST_MODIFIED;
use http::header::LOCATION;
+use http::header::{CACHE_CONTROL, CONTENT_ENCODING};
use http::HeaderValue;
use http::{HeaderMap, HeaderName};
use md5::Digest;
@@ -77,6 +77,11 @@ pub fn parse_content_type(headers: &HeaderMap) -> Result