BugTrack/2495 .htaccess files in Apache 2.4 format

diff --git a/.htaccess b/.htaccess
index 0025262..40f2e3e 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,27 +1,24 @@
 # Apache .htaccess for PukiWiki
 #
-# $Id: .htaccess,v 1.14 2005/04/29 11:51:31 henoheno Exp $
-# Copyright (C)
-#   2002-2005 PukiWiki Developers Team
+# Copyright
+#   2002-2020 PukiWiki Development Team
 #   2001      Originally written by yu-ji
 # License: GPL v2 or (at your option) any later version
 #
 # NOTE: Correct permission of this file 644(or 604)
 
-## Access control by Order/Allow/Deny directives
+## Access control by Require directive
 ## needs 'AllowOverride Limit' at httpd.conf
 
 # Prohibit direct access to .htaccess, .htpasswd or others
 # (If it's not set by default)
 #<FilesMatch "^\.ht">
-#      Order allow,deny
-#      Deny from all
+#  Require all denied
 #</FilesMatch>
 
 # Prohibit direct access
 <FilesMatch "\.(ini\.php|lng\.php|txt|gz|tgz|zip)$">
-       Order allow,deny
-       Deny from all
+  Require all denied
 </FilesMatch>
 
 ## Authentication to this directory with basic-auth

diff --git a/attach/.htaccess b/attach/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/attach/.htaccess
+++ b/attach/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/backup/.htaccess b/backup/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/backup/.htaccess
+++ b/backup/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/cache/.htaccess b/cache/.htaccess
index a3c4e50..2d7e05e 100644 (file)
--- a/cache/.htaccess
+++ b/cache/.htaccess
@@ -1,7 +1,6 @@
-Order allow,deny
-Deny from all
+Require all denied
 
 # Amazon plugin's Image cache
 <FilesMatch "^ASIN.*\.jpg$">
-       Allow from all
+  Require all granted
 </FilesMatch>

diff --git a/counter/.htaccess b/counter/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/counter/.htaccess
+++ b/counter/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/diff/.htaccess b/diff/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/diff/.htaccess
+++ b/diff/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/lib/.htaccess b/lib/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/lib/.htaccess
+++ b/lib/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/plugin/.htaccess b/plugin/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/plugin/.htaccess
+++ b/plugin/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/skin/.htaccess b/skin/.htaccess
index 0007e48..8571675 100644 (file)
--- a/skin/.htaccess
+++ b/skin/.htaccess
@@ -1,4 +1,3 @@
 <FilesMatch "\.(skin\.php)$">
-        Order allow,deny
-        Deny from all
+  Require all denied
 </FilesMatch>

diff --git a/wiki.en/.htaccess b/wiki.en/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/wiki.en/.htaccess
+++ b/wiki.en/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied

diff --git a/wiki/.htaccess b/wiki/.htaccess
index cb24fd7..b66e808 100644 (file)
--- a/wiki/.htaccess
+++ b/wiki/.htaccess
@@ -1,2 +1 @@
-Order allow,deny
-Deny from all
+Require all denied