From 36684dcf752c761f02bc85c6513db81e6482facd Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 10 Oct 2018 18:37:08 +0200
Subject: [PATCH 1/2] Mulitple HSTS headers are not allowed, should either
 unset before adding new, or set conditionally.

---
 install/tpl/apache_ispconfig.vhost.master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 8eccbcba38..57c70885d7 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -88,7 +88,7 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
   </tmpl_if>
 
   <IfModule mod_headers.c>
-    Header always add Strict-Transport-Security "max-age=15768000"
+    Header setifempty add Strict-Transport-Security "max-age=15768000"
 	RequestHeader unset Proxy early
   </IfModule>
 
-- 
GitLab


From ca7c77d98cf8e8136be883ea29056de7097beef8 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 10 Oct 2018 18:41:26 +0200
Subject: [PATCH 2/2] Update apache_ispconfig.vhost.master

---
 install/tpl/apache_ispconfig.vhost.master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 57c70885d7..5c4ef22485 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -88,7 +88,7 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
   </tmpl_if>
 
   <IfModule mod_headers.c>
-    Header setifempty add Strict-Transport-Security "max-age=15768000"
+    Header setifempty Strict-Transport-Security "max-age=15768000"
 	RequestHeader unset Proxy early
   </IfModule>
 
-- 
GitLab