Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use idenity encoding on client if no compression features are enabled #1737

Merged
merged 9 commits into from
Oct 24, 2020
Merged

use idenity encoding on client if no compression features are enabled #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7811292
Use Accept-Encoding=idenity if no compression feature is enabled (#1731)
j-brn Oct 16, 2020
cef47d1
awc: add cfg-if dependency
j-brn Oct 16, 2020
62e390e
awc: relace cfg attributes for HTTPS_ENCODING with cfg-if
j-brn Oct 16, 2020
cf10182
Merge branch 'master' into fix_accept-encoding_header_without_compres…
JohnTitor Oct 19, 2020
c2aeea5
Add changelog entry for the `Accept-Content` fix in awc
j-brn Oct 19, 2020
1d7019d
Merge branch 'master' into fix_accept-encoding_header_without_compres…
j-brn Oct 19, 2020
06841e1
Move awc changelog entry to awc/CHANGES.md
j-brn Oct 19, 2020
45ab390
Merge branch 'master' into fix_accept-encoding_header_without_compres…
robjtede Oct 24, 2020
70519f9
Merge branch 'master' into fix_accept-encoding_header_without_compres…
robjtede Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions awc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
# Changes

## Unreleased - 2020-xx-xx
### Changed
* Upgrade `base64` to `0.13`.

### Fixed
* Use `Accept-Encoding: identity` instead of `Accept-Encoding: br` when no compression feature is enabled [#1737]

[#1737]: https://github.com/actix/actix-web/pull/1737


## 2.0.0 - 2020-09-11
### Changed
* `Client::build` was renamed to `Client::builder`.
Expand Down
1 change: 1 addition & 0 deletions awc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ actix-rt = "1.0.0"

base64 = "0.13"
bytes = "0.5.3"
cfg-if = "1.0"
derive_more = "0.99.2"
futures-core = { version = "0.3.5", default-features = false }
log =" 0.4"
Expand Down
13 changes: 9 additions & 4 deletions awc/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@ use crate::frozen::FrozenClientRequest;
use crate::sender::{PrepForSendingError, RequestSender, SendClientRequest};
use crate::ClientConfig;

#[cfg(any(feature = "flate2-zlib", feature = "flate2-rust"))]
const HTTPS_ENCODING: &str = "br, gzip, deflate";
#[cfg(not(any(feature = "flate2-zlib", feature = "flate2-rust")))]
const HTTPS_ENCODING: &str = "br";
cfg_if::cfg_if! {
if #[cfg(any(feature = "flate2-zlib", feature = "flate2-rust"))] {
const HTTPS_ENCODING: &str = "br, gzip, deflate";
} else if #[cfg(feature = "compress")] {
const HTTPS_ENCODING: &str = "br";
} else {
const HTTPS_ENCODING: &str = "identity";
}
}

/// An HTTP Client request builder
///
Expand Down