From b70bdeb2ed17a03e1a24b37cb0a61d66d868522d Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 11 Mar 2015 17:49:24 +0100
Subject: Bug 1138463: mod_perl does not support Apache 2.4 directives r=dkl
 a=glob

---
 .htaccess                      |  7 ++++-
 Bugzilla/Install/Filesystem.pm | 59 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index 2f009697c..aec901005 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 5f5677460..d2d342a77 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>
@@ -355,7 +360,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>
@@ -369,7 +379,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>
@@ -389,8 +404,14 @@ EOT
 #      Deny from all
 #    </IfVersion>
 #    <IfVersion >= 2.4>
-#      Require ip 127.0.0.1/24
-#      Require all denied
+#      <IfModule mod_perl.c>
+#        Allow from 127.0.0.1/24
+#        Deny from all
+#      </IfModule>
+#      <IfModule !mod_perl.c>
+#        Require ip 127.0.0.1/24
+#        Require all denied
+#      </IfModule>
 #    </IfVersion>
 #  </IfModule>
 #  <IfModule !mod_version.c>
@@ -406,7 +427,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>
@@ -420,7 +446,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>
@@ -437,7 +468,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>
@@ -451,7 +487,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>
-- 
cgit v1.2.3-24-g4f1b