From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 11 Mar 2015 17:22:05 +0000 (+0100)
Subject: Bug 1138463: mod_perl does not support Apache 2.4 directives
X-Git-Tag: bugzilla-5.0rc3~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e07807a8940776557a86134546bc4a7997cd0a;p=thirdparty%2Fbugzilla.git

Bug 1138463: mod_perl does not support Apache 2.4 directives
r=dkl a=glob
---

diff --git a/.htaccess b/.htaccess
index 2f009697cc..aec901005b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,7 +5,12 @@
       Deny from all
     </IfVersion>
     <IfVersion >= 2.4>
-      Require all denied
+      <IfModule mod_perl.c>
+        Deny from all
+      </IfModule>
+      <IfModule !mod_perl.c>
+        Require all denied
+      </IfModule>
     </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 4f133d8656..cf0a5b0cab 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -52,7 +52,12 @@ use constant HT_DEFAULT_DENY => <<EOT;
     Deny from all
   </IfVersion>
   <IfVersion >= 2.4>
-    Require all denied
+    <IfModule mod_perl.c>
+      Deny from all
+    </IfModule>
+    <IfModule !mod_perl.c>
+      Require all denied
+    </IfModule>
   </IfVersion>
 </IfModule>
 <IfModule !mod_version.c>
@@ -354,7 +359,12 @@ EOT
       Allow from all
     </IfVersion>
     <IfVersion >= 2.4>
-      Require all granted
+      <IfModule mod_perl.c>
+        Allow from all
+      </IfModule>
+      <IfModule !mod_perl.c>
+        Require all granted
+      </IfModule>
     </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
@@ -368,7 +378,12 @@ EOT
     Deny from all
   </IfVersion>
   <IfVersion >= 2.4>
-    Require all denied
+    <IfModule mod_perl.c>
+      Deny from all
+    </IfModule>
+    <IfModule !mod_perl.c>
+      Require all denied
+    </IfModule>
   </IfVersion>
 </IfModule>
 <IfModule !mod_version.c>
@@ -388,8 +403,14 @@ EOT
       Deny from all
     </IfVersion>
     <IfVersion >= 2.4>
-      Require ip 192.20.225.0/24
-      Require all denied
+      <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>
     </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
@@ -405,7 +426,12 @@ EOT
       Allow from all
     </IfVersion>
     <IfVersion >= 2.4>
-      Require all granted
+      <IfModule mod_perl.c>
+        Allow from all
+      </IfModule>
+      <IfModule !mod_perl.c>
+        Require all granted
+      </IfModule>
     </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
@@ -419,7 +445,12 @@ EOT
     Deny from all
   </IfVersion>
   <IfVersion >= 2.4>
-    Require all denied
+    <IfModule mod_perl.c>
+      Deny from all
+    </IfModule>
+    <IfModule !mod_perl.c>
+      Require all denied
+    </IfModule>
   </IfVersion>
 </IfModule>
 <IfModule !mod_version.c>
@@ -436,7 +467,12 @@ EOT
       Allow from all
     </IfVersion>
     <IfVersion >= 2.4>
-      Require all granted
+      <IfModule mod_perl.c>
+        Allow from all
+      </IfModule>
+      <IfModule !mod_perl.c>
+        Require all granted
+      </IfModule>
     </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
@@ -450,7 +486,12 @@ EOT
     Deny from all
   </IfVersion>
   <IfVersion >= 2.4>
-    Require all denied
+    <IfModule mod_perl.c>
+      Deny from all
+    </IfModule>
+    <IfModule !mod_perl.c>
+      Require all denied
+    </IfModule>
   </IfVersion>
 </IfModule>
 <IfModule !mod_version.c>