Commit eada920c authored by Till Brehm's avatar Till Brehm

Merge branch 'patch-3' into 'stable-3.1'

Mulitple HSTS headers are not allowed, should either unset before adding new, or set conditionally.

See merge request ispconfig/ispconfig3!822
parents e2465bd7 ca7c77d9
...@@ -88,7 +88,7 @@ NameVirtualHost *:<tmpl_var name="vhost_port"> ...@@ -88,7 +88,7 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
</tmpl_if> </tmpl_if>
<IfModule mod_headers.c> <IfModule mod_headers.c>
Header always add Strict-Transport-Security "max-age=15768000" Header setifempty Strict-Transport-Security "max-age=15768000"
RequestHeader unset Proxy early RequestHeader unset Proxy early
</IfModule> </IfModule>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment