1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-05-19 16:58:14 +00:00

fix response body when no content-length header

This commit is contained in:
Armand Mégrot 2023-05-20 12:03:09 +02:00
parent 17218dc6c8
commit 5f1a4607e5
No known key found for this signature in database
GPG key ID: AB2C9B2C53EF3AC5
3 changed files with 19 additions and 3 deletions

View file

@ -7,6 +7,10 @@
- Add `body::to_body_limit()` function.
- Add `body::BodyLimitExceeded` error type.
### Fixed
- Fix `MessageType::set_headers` not using the correct payload decoder when Transfer-Encoding and Content-Length are absent.
## 3.3.1 - 2023-03-02
### Fixed

View file

@ -395,8 +395,20 @@ impl MessageType for ResponseHead {
// switching protocol or connect
PayloadType::Stream(PayloadDecoder::eof())
} else {
// for HTTP/1.0 read to eof and close connection
if msg.version == Version::HTTP_10 {
let body_allowed = match msg.status.as_u16() {
100..=199 => false,
204 => false,
304 => false,
_ => true,
};
// for HTTP/1.0 and HTTP/1.1 read to eof and close connection
if msg.version == Version::HTTP_11 && body_allowed {
if let Some(ConnectionType::Close) = msg.conn_type() {
PayloadType::Payload(PayloadDecoder::eof())
} else {
PayloadType::None
}
} else if msg.version == Version::HTTP_10 {
msg.set_connection_type(ConnectionType::Close);
PayloadType::Payload(PayloadDecoder::eof())
} else {

View file

@ -769,7 +769,7 @@ async fn client_unread_response() {
// awc does not read all bytes unless content-length is specified
let bytes = res.body().await.unwrap();
assert_eq!(bytes, Bytes::from_static(b""));
assert_eq!(bytes, Bytes::from_static(b"welcome!"));
}
#[actix_rt::test]