Bug 1363736 - Ensure http configs (.htaccess) are forward-compatible with newer versi...

diff --git a/Bugzilla/ModPerl.pm b/Bugzilla/ModPerl.pm
index 22be8e678e5b055452c82c2ec1263ad32fe52b34..42048a5c5b736ceeecb1bb3286eb0ac3f9506c16 100644 (file)
--- a/Bugzilla/ModPerl.pm
+++ b/Bugzilla/ModPerl.pm
@@ -50,6 +50,15 @@ sub apache_config {
         cgi_path       => $cgi_path,
     );
     $template->process(\*DATA, \%vars, \$conf);
+    my $apache_version = Apache2::ServerUtil::get_server_version();
+    if ($apache_version =~ m!Apache/(\d+)\.(\d+)\.(\d+)!) {
+        my ($major, $minor, $patch) = ($1, $2, $3);
+        if ($major > 2 || $major == 2 && $minor >= 4) {
+            $conf =~ s{^\s+deny\s+from\s+all.*$}{Require all denied}gmi;
+            $conf =~ s{^\s+allow\s+from\s+all.*$}{Require all granted}gmi;
+            $conf =~ s{^\s+allow\s+from\s+(\S+).*$}{Require host $1}gmi;
+        }
+    }
 
     return $conf;
 }