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:
boxdot 2019-03-01 16:15:02 +01:00 committed by GitHub
parent 4fba72e459 6d11ee683f
commit 902081a639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -7,6 +7,8 @@
* Add `from_file` and `from_file_with_config` to `NamedFile` to allow sending files without a known path. #670 * Add `from_file` and `from_file_with_config` to `NamedFile` to allow sending files without a known path. #670
* Support handlers returning `()`. Unit is converted to 200 response with an empty body. * Support handlers returning `()`. Unit is converted to 200 response with an empty body.
* Add `insert` and `remove` methods to `HttpResponseBuilder`
### Fixed ### Fixed
* Ignored the `If-Modified-Since` if `If-None-Match` is specified. #680 * Ignored the `If-Modified-Since` if `If-None-Match` is specified. #680

2
src/extractor.rs
View File

@ -193,7 +193,7 @@ impl<T: fmt::Display> fmt::Display for Path<T> {
} }
#[derive(PartialEq, Eq, PartialOrd, Ord)] #[derive(PartialEq, Eq, PartialOrd, Ord)]
/// Extract typed information from from the request's query. /// Extract typed information from the request's query.
/// ///
/// ## Example /// ## Example
/// ///