From 26c9a45ca63e33d66d06ff0d1ae44487f52b4ab6 Mon Sep 17 00:00:00 2001
From: Felix Eckhofer <felix@eckhofer.com>
Date: Thu, 12 Oct 2017 11:51:53 +0200
Subject: [PATCH] fix: Allow Options in .htaccess to be merged (#7472)

Apache will replace `Options` from the server config with new ones
provided in `.htaccess` unless all of the parameters start with either
`+` or `-`. This effectively disables `+ExecCGI` and others that might
be needed for proper operation.
---
 html/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/.htaccess b/html/.htaccess
index dfcceb9a3b..608a095d82 100644
--- a/html/.htaccess
+++ b/html/.htaccess
@@ -1,7 +1,7 @@
 #  DO NOT CHANGE THIS FILE
 #  If you need to change this file, you are doing something wrong.
 
-Options FollowSymlinks Multiviews
+Options +FollowSymlinks +Multiviews
 
 AddType image/svg+xml .svg
 <IfModule mod_filter.c>