Orange-OpenSource/hurl
1
1
Fork 0
mirror of https://github.com/Orange-OpenSource/hurl.git synced 2024-07-07 10:16:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify response body decoding when there is no content encoding.

Browse Source
This commit is contained in:
Jean-Christophe Amiel 2024-07-04 13:20:48 +02:00
parent 1ed0b4e29c
commit 3141e344cd
No known key found for this signature in database
GPG Key ID: 07FF11CFD55356CC
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/hurl/src/http/response_decoding.rs
View File

@ -67,12 +67,17 @@ impl ContentEncoding {
impl Response {
/// Returns response body as text.
pub fn text(&self) -> Result<String, HttpError> {
let encoding = self.headers.character_encoding()?;
let body = &self.uncompress_body()?;
match encoding.decode(body, DecoderTrap::Strict) {
let content_encodings = self.headers.content_encoding()?;
let body = if content_encodings.is_empty() {
&self.body
} else {
&self.uncompress_body()?
};
let character_encoding = self.headers.character_encoding()?;
match character_encoding.decode(body, DecoderTrap::Strict) {
Ok(s) => Ok(s),
Err(_) => Err(HttpError::InvalidDecoding {
charset: encoding.name().to_string(),
charset: character_encoding.name().to_string(),
}),
}
}