From 31e2be249e6563abd755469cf8c24920d6481990 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 28 Feb 2021 01:36:16 +0100
Subject: Re-do the way setting multiple headers works

---
 src/main.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/main.rs')

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
-- 
cgit v1.2.3