From 2303eebcc8b24c745aa866dd6299459532201da8 Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Fri, 16 Apr 2021 10:05:02 +0200
Subject: [PATCH] Update .htaccess (PHP8 and mod_lsapi)

- Add `mod_lsapi` (Cloudlinux) authorization headers
- Add `mod_php8` php_values
- Reformating for better lisibilty
---
 .htaccess | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index 2a6a0cbfac6..46e83b17e1f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,6 +7,10 @@
     <IfModule mod_proxy_fcgi.c>
        SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
     </IfModule>
+    <IfModule mod_lsapi.c>
+      SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+      RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+    </IfModule>
   </IfModule>
 
   <IfModule mod_env.c>
@@ -48,6 +52,7 @@
     Header set Cache-Control "max-age=604800"
   </FilesMatch>
 </IfModule>
+
 <IfModule mod_php7.c>
   php_value mbstring.func_overload 0
   php_value default_charset 'UTF-8'
@@ -56,6 +61,29 @@
     SetEnv htaccessWorking true
   </IfModule>
 </IfModule>
+
+<IfModule mod_php8.c>
+  php_value mbstring.func_overload 0
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
+</IfModule>
+
+<IfModule mod_mime.c>
+  AddType image/svg+xml svg svgz
+  AddEncoding gzip svgz
+</IfModule>
+
+<IfModule mod_dir.c>
+  DirectoryIndex index.php index.html
+</IfModule>
+
+<IfModule pagespeed_module>
+  ModPagespeed Off
+</IfModule>
+
 <IfModule mod_rewrite.c>
   RewriteEngine on
   RewriteCond %{HTTP_USER_AGENT} DavClnt
@@ -68,15 +96,6 @@
   RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
   RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
-<IfModule mod_mime.c>
-  AddType image/svg+xml svg svgz
-  AddEncoding gzip svgz
-</IfModule>
-<IfModule mod_dir.c>
-  DirectoryIndex index.php index.html
-</IfModule>
+
 AddDefaultCharset utf-8
 Options -Indexes
-<IfModule pagespeed_module>
-  ModPagespeed Off
-</IfModule>