actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-23 16:21:06 +01:00
Code Issues Releases Wiki Activity

fix h2 not using error response (#1080)

Browse Source 
* fix h2 not using error response

* add fix change log

* fix h2 service error tests
This commit is contained in:
Ronald Chan 2019-09-09 18:24:57 +08:00 committed by Nikolay Kim
parent 1d96ae9bc3
commit 5e8f1c338c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -5,6 +5,9 @@
* Add `middleware::Conditon` that conditionally enables another middleware
### Fixed
* h2 will use error response #1080
## [1.0.7] - 2019-08-29

4
actix-http/src/h2/dispatcher.rs
View File

@ -257,8 +257,8 @@ where
}
}
Ok(Async::NotReady) => Ok(Async::NotReady),
Err(_e) => {
let res: Response = Response::InternalServerError().finish();
Err(e) => {
let res: Response = e.into().into();
let (res, body) = res.replace_body(());
let mut send = send.take().unwrap();

4
actix-http/tests/test_rustls_server.rs
View File

@ -454,9 +454,9 @@ fn test_h2_service_error() {
});
let response = srv.block_on(srv.sget("/").send()).unwrap();
assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
assert_eq!(response.status(), http::StatusCode::BAD_REQUEST);
// read response
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
assert_eq!(bytes, Bytes::from_static(b"error"));
}

4
actix-http/tests/test_ssl_server.rs
View File

@ -449,11 +449,11 @@ fn test_h2_service_error() {
});
let response = srv.block_on(srv.sget("/").send()).unwrap();
assert_eq!(response.status(), StatusCode::INTERNAL_SERVER_ERROR);
assert_eq!(response.status(), StatusCode::BAD_REQUEST);
// read response
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
assert_eq!(bytes, Bytes::from_static(b"error"));
}
#[test]