index : static-web-server.git

a5e87e5936e3c326d26a6f9636d6bdb51635fce5 [patch]

061a80d4bd0899232c04d1bcdf3f9605689e86fa

c84d94874d63e848628df3cfd9ce45b507ae9579

a5e87e5936e3c326d26a6f9636d6bdb51635fce5.tar.gz

refactor: typed `content-type` header for error pages & dir listing

Diff

 src/error_page.rs   | 11 ++++-------
 src/static_files.rs |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/error_page.rs b/src/error_page.rs
index 193bec3..9370ccf 100644
--- a/src/error_page.rs
+++ b/src/error_page.rs
@@ -1,6 +1,6 @@
use headers::{AcceptRanges, ContentLength, ContentType, HeaderMapExt, HeaderValue};
use http::header::CONTENT_TYPE;
use headers::{AcceptRanges, ContentLength, ContentType, HeaderMapExt};
use hyper::{Body, Method, Response, StatusCode};
use mime_guess::mime;

use crate::Result;

@@ -83,12 +83,9 @@ pub fn error_response(

    let mut resp = Response::new(body);
    *resp.status_mut() = *status_code;
    resp.headers_mut().insert(
        CONTENT_TYPE,
        HeaderValue::from_static("text/html; charset=utf-8"),
    );
    resp.headers_mut()
        .typed_insert(ContentType::from(mime::TEXT_HTML_UTF_8));
    resp.headers_mut().typed_insert(ContentLength(len));
    resp.headers_mut().typed_insert(ContentType::html());
    resp.headers_mut().typed_insert(AcceptRanges::bytes());

    Ok(resp)
diff --git a/src/static_files.rs b/src/static_files.rs
index ef4d3d9..1fe5cc5 100644
--- a/src/static_files.rs
+++ b/src/static_files.rs
@@ -8,9 +8,9 @@ use headers::{
    AcceptRanges, ContentLength, ContentRange, ContentType, HeaderMap, HeaderMapExt, HeaderValue,
    IfModifiedSince, IfRange, IfUnmodifiedSince, LastModified, Range,
};
use http::header::CONTENT_TYPE;
use humansize::{file_size_opts, FileSize};
use hyper::{Body, Method, Response, StatusCode};
use mime_guess::mime;
use percent_encoding::percent_decode_str;
use std::cmp::Ordering;
use std::fs::Metadata;
@@ -361,10 +361,8 @@ async fn read_directory_entries(
    );

    let mut resp = Response::new(Body::empty());
    resp.headers_mut().insert(
        CONTENT_TYPE,
        HeaderValue::from_static("text/html; charset=utf-8"),
    );
    resp.headers_mut()
        .typed_insert(ContentType::from(mime::TEXT_HTML_UTF_8));
    resp.headers_mut()
        .typed_insert(ContentLength(page_str.len() as u64));