aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2015-12-02 00:13:32 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2015-12-02 00:13:32 +0100
commit9177ade42ec12f685934f1866c68dd0790964d6c (patch)
treeec50a8b9a2eafafd6cbc177496b8d6ada52f6b7a
parent3dbd99b27e6c2abba5462f161305b6413d8cb91d (diff)
downloadbugs-9177ade42ec12f685934f1866c68dd0790964d6c.tar
bugs-9177ade42ec12f685934f1866c68dd0790964d6c.tar.gz
bugs-9177ade42ec12f685934f1866c68dd0790964d6c.tar.bz2
bugs-9177ade42ec12f685934f1866c68dd0790964d6c.tar.xz
bugs-9177ade42ec12f685934f1866c68dd0790964d6c.zip
Back out bug 1138463. This fix is actually incorrect and the bug was correctly fixed by bug 1223790
a=dkl on IRC
-rw-r--r--.htaccess7
-rw-r--r--Bugzilla/Install/Filesystem.pm45
2 files changed, 8 insertions, 44 deletions
diff --git a/.htaccess b/.htaccess
index aec901005..2f009697c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,12 +5,7 @@
Deny from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Deny from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all denied
- </IfModule>
+ Require all denied
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index cf0a5b0ca..f19a81751 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -52,12 +52,7 @@ use constant HT_DEFAULT_DENY => <<EOT;
Deny from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Deny from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all denied
- </IfModule>
+ Require all denied
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
@@ -359,12 +354,7 @@ EOT
Allow from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Allow from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all granted
- </IfModule>
+ Require all granted
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
@@ -378,12 +368,7 @@ EOT
Deny from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Deny from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all denied
- </IfModule>
+ Require all denied
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
@@ -403,14 +388,8 @@ EOT
Deny from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Allow from 192.20.225.0/24
- Deny from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require ip 192.20.225.0/24
- Require all denied
- </IfModule>
+ Require ip 192.20.225.0/24
+ Require all denied
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
@@ -426,12 +405,7 @@ EOT
Allow from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Allow from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all granted
- </IfModule>
+ Require all granted
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
@@ -445,12 +419,7 @@ EOT
Deny from all
</IfVersion>
<IfVersion >= 2.4>
- <IfModule mod_perl.c>
- Deny from all
- </IfModule>
- <IfModule !mod_perl.c>
- Require all denied
- </IfModule>
+ Require all denied
</IfVersion>
</IfModule>
<IfModule !mod_version.c>