[bugzilla-gnome-org-upstream/4.4] Bug 1138463: mod_perl does not support Apache 2.4 directives r=dkl a=glob

[Andrea Veri <av src gnome org>]

commit f0c2b6bf0d70252d2d76a386c46001ddb330d6aa
Author: Frédéric Buclin <LpSolit gmail com>
Date:   Wed Mar 11 18:26:25 2015 +0100

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

 .htaccess                      |    7 +++++-
 Bugzilla/Install/Filesystem.pm |   45 +++++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 8 deletions(-)
---
diff --git a/.htaccess b/.htaccess
index 22e6658..8b50250 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 eaca1f8..457f66f 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>