From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 11 Mar 2015 17:26:25 +0000 (+0100)
Subject: Bug 1138463: mod_perl does not support Apache 2.4 directives
X-Git-Tag: bugzilla-4.4.9~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c2b6bf0d70252d2d76a386c46001ddb330d6aa;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 22e6658bde..8b502500ba 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 eaca1f8b4d..457f66f9ad 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -48,7 +48,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>
@@ -344,7 +349,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>
@@ -358,7 +368,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>
@@ -378,8 +393,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>
@@ -395,7 +416,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>
@@ -409,7 +435,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>