diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:37:28 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:37:28 +0200 |
| commit | c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc (patch) | |
| tree | c19e671fc8d4b84db5f9aa85d1d55e90362ca160 | |
| parent | a995f1166c7c58ef2ae1f3474c4c1674110fab5e (diff) | |
| parent | af7ec71967102a0ec591ad4f0da704b58a44fe8b (diff) | |
| download | forums-c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc.tar forums-c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc.tar.gz forums-c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc.tar.bz2 forums-c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc.tar.xz forums-c7baeaa912ac9187de0944a8a22a2f0d3c49c3dc.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| -rw-r--r-- | phpBB/.htaccess | 56 |
1 files changed, 47 insertions, 9 deletions
diff --git a/phpBB/.htaccess b/phpBB/.htaccess index 6f33916775..1ae74ed825 100644 --- a/phpBB/.htaccess +++ b/phpBB/.htaccess @@ -26,12 +26,50 @@ RewriteRule ^(.*)$ app.php [QSA,L] #Options +FollowSymLinks </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> |