aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorSven-Hendrik Haase <svenstaro@gmail.com>2021-02-28 00:36:16 +0000
committerSven-Hendrik Haase <svenstaro@gmail.com>2021-02-28 00:36:16 +0000
commit31e2be249e6563abd755469cf8c24920d6481990 (patch)
tree963d0b07e5d01c726d2330ef18887eee3410aa18 /src/main.rs
parentAdd CHANGELOG entry for custom headers (diff)
downloadminiserve-31e2be249e6563abd755469cf8c24920d6481990.tar.gz
miniserve-31e2be249e6563abd755469cf8c24920d6481990.zip
Re-do the way setting multiple headers works
Diffstat (limited to '')
-rw-r--r--src/main.rs17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/main.rs b/src/main.rs
index 44298d7..a407136 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -91,7 +91,7 @@ pub struct MiniserveConfig {
pub title: Option<String>,
/// If specified, header will be added
- pub header: Option<HeaderMap>,
+ pub header: Vec<HeaderMap>,
}
fn main() {
@@ -287,18 +287,15 @@ async fn run() -> Result<(), ContextualError> {
fn configure_header(conf: &MiniserveConfig) -> middleware::DefaultHeaders {
let headers = conf.clone().header;
- match headers {
- Some(headers) => {
- let mut default_headers = middleware::DefaultHeaders::new();
- for (header_name, header_value) in headers.into_iter() {
- if let Some(header_name) = header_name {
- default_headers = default_headers.header(&header_name, header_value);
- }
+ let mut default_headers = middleware::DefaultHeaders::new();
+ for header in headers {
+ for (header_name, header_value) in header.into_iter() {
+ if let Some(header_name) = header_name {
+ default_headers = default_headers.header(&header_name, header_value);
}
- default_headers
}
- _ => middleware::DefaultHeaders::new(),
}
+ default_headers
}
/// Configures the Actix application