diff options
author | 2015-12-02 00:13:32 +0100 | |
---|---|---|
committer | 2015-12-02 00:13:32 +0100 | |
commit | 9177ade42ec12f685934f1866c68dd0790964d6c (patch) | |
tree | ec50a8b9a2eafafd6cbc177496b8d6ada52f6b7a | |
parent | Bug 1227455 - Multiselect parameters (type 'm') are not read correctly from t... (diff) | |
download | bugzilla-9177ade42ec12f685934f1866c68dd0790964d6c.tar.gz bugzilla-9177ade42ec12f685934f1866c68dd0790964d6c.tar.bz2 bugzilla-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-- | .htaccess | 7 | ||||
-rw-r--r-- | Bugzilla/Install/Filesystem.pm | 45 |
2 files changed, 8 insertions, 44 deletions
@@ -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> |