From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 22 Sep 2020 09:45:58 +0000 (+0200)
Subject: Merge pull request #1556 from kcaran/apache_methods
X-Git-Tag: v0.12.0-beta-1~13
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=6f199ee48906ca8cdc7d7f2cacbd4c57f474c879;hp=-c

Merge pull request #1556 from kcaran/apache_methods
---

6f199ee48906ca8cdc7d7f2cacbd4c57f474c879
diff --combined .htaccess
index 8876e346,76fd7d09..af2dc5a7
--- a/.htaccess
+++ b/.htaccess
@@@ -7,7 -7,6 +7,7 @@@ RewriteEngine O
  RewriteRule ^(.git|doxygen|vendor) - [F]
  
  # Forward the "Authorization" HTTP header
 +# fixes JWT token not correctly forwarded on some Apache/FastCGI setups
  RewriteCond %{HTTP:Authorization} ^(.*)
  RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
  
@@@ -16,23 -15,7 +16,7 @@@ RewriteCond %{REQUEST_FILENAME} !-
  RewriteCond %{REQUEST_FILENAME} !-d
  RewriteRule ^ index.php [QSA,L]
  
- <Limit GET POST PUT DELETE OPTIONS>
-   <IfModule version_module>
-     <IfVersion >= 2.4>
-        Require all granted
-     </IfVersion>
-     <IfVersion < 2.4>
-        Allow from all
-        Deny from none
-     </IfVersion>
-   </IfModule>
- 
-   <IfModule !version_module>
-     Require all granted
-   </IfModule>
- </Limit>
- 
- <LimitExcept GET POST PUT DELETE OPTIONS>
+ <LimitExcept GET POST PUT DELETE PATCH OPTIONS>
    <IfModule version_module>
      <IfVersion >= 2.4>
         Require all denied