From 658d51091c1e6b7f2c5574be123a1500ef8ef4af Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Sun, 11 Dec 2022 01:20:49 +0400
Subject: [PATCH] Consolidate and move options to the top

---
 public/.htaccess | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/.htaccess b/public/.htaccess
index b8dd61352..2a2f5fab5 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,5 +1,6 @@
 # Disable directory browsing
-Options All -Indexes
+# For security reasons, Option all cannot be overridden.
+Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
 
 # ----------------------------------------------------------------------
 # Rewrite engine
@@ -8,7 +9,6 @@ Options All -Indexes
 # Turning on the rewrite engine is necessary for the following rules and features.
 # FollowSymLinks must be enabled for this to work.
 <IfModule mod_rewrite.c>
-	Options +SymLinksIfOwnerMatch
 	RewriteEngine On
 
 	# If you installed CodeIgniter in a subfolder, you will need to
@@ -66,10 +66,6 @@ Options All -Indexes
   </FilesMatch>
 </IfModule>
 
-# disable directory browsing
-# For security reasons, Option all cannot be overridden.
-Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
-
 <IfModule mod_headers.c>
   Header always set X-Frame-Options "SAMEORIGIN"
   Header add Content-Security-Policy "default-src 'self' www.google.com; connect-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' www.google.com www.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; font-src 'self' fonts.googleapis.com fonts.gstatic.com; img-src 'self' data:; object-src 'none'; form-action 'self'"