mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-04 05:17:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation error

Browse source
This commit is contained in:
Nikolay Kim 2022-11-30 17:20:56 +01:00
parent b22435317e
commit 2abe40fdf6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ntex-files/Cargo.toml
View file

@ -18,11 +18,13 @@ name = "ntex_files"
path = "src/lib.rs"
[dependencies]
ntex = "0.5.14"
ntex = "0.5.30"
ntex-http = "0.1.8"
bitflags = "1.3"
futures = "0.3"
derive_more = "0.99"
hyperx = "1.0.0"
http = "0.2"
hyperx = "1.4.0"
log = "0.4"
mime = "0.3"
mime_guess = "2.0.1"

6
ntex-files/src/named.rs
View file

@ -423,7 +423,8 @@ impl DerefMut for NamedFile {
/// Returns true if `req` has no `If-Match` header or one which matches `etag`.
fn any_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
if let Some(val) = req.headers().get(http::header::IF_MATCH) {
if let Ok(val) = header::IfMatch::parse_header(&val) {
let hdr = ::http::HeaderValue::from(val);
if let Ok(val) = header::IfMatch::parse_header(&&hdr) {
match val {
header::IfMatch::Any => return true,
header::IfMatch::Items(ref items) => {
@ -445,7 +446,8 @@ fn any_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
/// Returns true if `req` doesn't have an `If-None-Match` header matching `req`.
fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
if let Some(val) = req.headers().get(http::header::IF_NONE_MATCH) {
if let Ok(val) = header::IfNoneMatch::parse_header(&val) {
let hdr = ::http::HeaderValue::from(val);
if let Ok(val) = header::IfNoneMatch::parse_header(&&hdr) {
return match val {
header::IfNoneMatch::Any => false,
header::IfNoneMatch::Items(ref items) => {