aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-09-23 14:10:21 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-09-23 14:10:21 +0200
commit6c3f3ec893b6b5b90bf10016df297e6ba07dc85d (patch)
treed21541ef5b970b26fe1b32ad037f5ecfff922c73 /phpBB
parenta5c532979d578b9c3807d252b064f5292820e4b7 (diff)
downloadforums-6c3f3ec893b6b5b90bf10016df297e6ba07dc85d.tar
forums-6c3f3ec893b6b5b90bf10016df297e6ba07dc85d.tar.gz
forums-6c3f3ec893b6b5b90bf10016df297e6ba07dc85d.tar.bz2
forums-6c3f3ec893b6b5b90bf10016df297e6ba07dc85d.tar.xz
forums-6c3f3ec893b6b5b90bf10016df297e6ba07dc85d.zip
[ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
PHPBB3-11860
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/.htaccess56
1 files changed, 47 insertions, 9 deletions
diff --git a/phpBB/.htaccess b/phpBB/.htaccess
index 474f9774c2..ad5e24d642 100644
--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -8,12 +8,50 @@
#RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
#</IfModule>
-<Files "config.php">
-Order Allow,Deny
-Deny from All
-</Files>
-
-<Files "common.php">
-Order Allow,Deny
-Deny from All
-</Files>
+# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
+# module mod_authz_host to a new module called mod_access_compat (which may be
+# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# We could just conditionally provide both versions, but unfortunately Apache
+# does not explicitly tell us its version if the module mod_version is not
+# available. In this case, we check for the availability of module
+# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
+<IfModule mod_version.c>
+ <IfVersion < 2.4>
+ <Files "config.php">
+ Order Allow,Deny
+ Deny from All
+ </Files>
+ <Files "common.php">
+ Order Allow,Deny
+ Deny from All
+ </Files>
+ </IfVersion>
+ <IfVersion >= 2.4>
+ <Files "config.php">
+ Require all denied
+ </Files>
+ <Files "common.php">
+ Require all denied
+ </Files>
+ </IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+ <IfModule !mod_authz_core.c>
+ <Files "config.php">
+ Order Allow,Deny
+ Deny from All
+ </Files>
+ <Files "common.php">
+ Order Allow,Deny
+ Deny from All
+ </Files>
+ </IfModule>
+ <IfModule mod_authz_core.c>
+ <Files "config.php">
+ Require all denied
+ </Files>
+ <Files "common.php">
+ Require all denied
+ </Files>
+ </IfModule>
+</IfModule>