berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Nikolay Kim 2019-05-04 08:41:24 -07:00 committed by GitHub
parent 421cde712d fc19ce41c4
commit 2c8c49e0c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actix-http/CHANGES.md
View File

@ -1,5 +1,12 @@
# Changes
## [0.1.5] - 2019-05-xx
### Fixed
* Clean up response extensions in response pool #817
## [0.1.4] - 2019-04-24
### Added

6
actix-http/src/error.rs
View File

@ -137,7 +137,7 @@ impl<E: ResponseError> ResponseError for TimeoutError<E> {
#[display(fmt = "UnknownError")]
struct UnitError;
/// `InternalServerError` for `JsonError`
/// `InternalServerError` for `UnitError`
impl ResponseError for UnitError {}
/// `InternalServerError` for `JsonError`
@ -150,11 +150,11 @@ impl ResponseError for FormError {}
impl ResponseError for TimerError {}
#[cfg(feature = "ssl")]
/// `InternalServerError` for `SslError`
/// `InternalServerError` for `openssl::ssl::Error`
impl ResponseError for openssl::ssl::Error {}
#[cfg(feature = "ssl")]
/// `InternalServerError` for `SslError`
/// `InternalServerError` for `openssl::ssl::HandshakeError`
impl ResponseError for openssl::ssl::HandshakeError<tokio_tcp::TcpStream> {}
/// Return `BAD_REQUEST` for `de::value::Error`

1
actix-http/src/message.rs
View File

@ -449,6 +449,7 @@ impl BoxedResponsePool {
fn release(&self, msg: Box<ResponseHead>) {
let v = &mut self.0.borrow_mut();
if v.len() < 128 {
msg.extensions.borrow_mut().clear();
v.push(msg);
}
}

2
awc/src/error.rs
View File

@ -65,7 +65,7 @@ pub enum JsonPayloadError {
Payload(PayloadError),
}
/// Return `InternlaServerError` for `JsonPayloadError`
/// Return `InternalServerError` for `JsonPayloadError`
impl ResponseError for JsonPayloadError {
fn error_response(&self) -> Response {
Response::new(StatusCode::INTERNAL_SERVER_ERROR)