aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2015-02-20 13:04:00 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2015-02-20 13:04:00 +0100
commit639b50f3b9458c4080ad701b0e2184d6d43ae1df (patch)
tree283d3d4224e2aa72f5488ba262410453b5619e77
parent9f1e3658e40902f829f4fe41df878ce8ac288010 (diff)
downloadbugs-639b50f3b9458c4080ad701b0e2184d6d43ae1df.tar
bugs-639b50f3b9458c4080ad701b0e2184d6d43ae1df.tar.gz
bugs-639b50f3b9458c4080ad701b0e2184d6d43ae1df.tar.bz2
bugs-639b50f3b9458c4080ad701b0e2184d6d43ae1df.tar.xz
bugs-639b50f3b9458c4080ad701b0e2184d6d43ae1df.zip
Bug 1133690: .htaccess incorrectly assumes that Apache 2.2.x can read new 2.4 directives
r=dkl a=glob
-rw-r--r--.htaccess4
-rw-r--r--Bugzilla/Install/Filesystem.pm34
2 files changed, 19 insertions, 19 deletions
diff --git a/.htaccess b/.htaccess
index 14325d152..2f009697c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,10 @@
# Don't allow people to retrieve non-cgi executable files or our private data
<FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*)$>
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all denied
</IfVersion>
</IfModule>
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 6d7f14ced..4f133d865 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -48,10 +48,10 @@ use constant HT_DEFAULT_DENY => <<EOT;
# nothing in this directory is retrievable unless overridden by an .htaccess
# in a subdirectory
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all denied
</IfVersion>
</IfModule>
@@ -350,10 +350,10 @@ EOT
# Allow access to .png and .gif files.
<FilesMatch (\\.gif|\\.png)\$>
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Allow from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all granted
</IfVersion>
</IfModule>
@@ -364,10 +364,10 @@ EOT
# And no directory listings, either.
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all denied
</IfVersion>
</IfModule>
@@ -383,14 +383,14 @@ EOT
# webdot server, you'll need to edit this
<FilesMatch \\.dot\$>
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Allow from 192.20.225.0/24
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require ip 192.20.225.0/24
Require all denied
- </IfVersion>
+ </IfVersion>
</IfModule>
<IfModule !mod_version.c>
Allow from 192.20.225.0/24
@@ -401,10 +401,10 @@ EOT
# Allow access to .png files created by a local copy of 'dot'
<FilesMatch \\.png\$>
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Allow from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all granted
</IfVersion>
</IfModule>
@@ -415,10 +415,10 @@ EOT
# And no directory listings, either.
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all denied
</IfVersion>
</IfModule>
@@ -432,10 +432,10 @@ EOT
# Allow access to .css files
<FilesMatch \\.(css|js)\$>
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Allow from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all granted
</IfVersion>
</IfModule>
@@ -446,10 +446,10 @@ EOT
# And no directory listings, either.
<IfModule mod_version.c>
- <IfVersion <= 2.2>
+ <IfVersion < 2.4>
Deny from all
</IfVersion>
- <IfVersion > 2.2>
+ <IfVersion >= 2.4>
Require all denied
</IfVersion>
</IfModule>