From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 20 Feb 2015 12:05:19 +0000 (+0100)
Subject: Bug 1133690: .htaccess incorrectly assumes that Apache 2.2.x can read new 2.4 directives
X-Git-Tag: bugzilla-4.4.9~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a7bb962ec530383e72f3532a5ff042a80edf9b;p=thirdparty%2Fbugzilla.git

Bug 1133690: .htaccess incorrectly assumes that Apache 2.2.x can read new 2.4 directives
r=dkl a=glob
---

diff --git a/.htaccess b/.htaccess
index d5bc8b26e9..22e6658bde 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,10 @@
 # Don't allow people to retrieve non-cgi executable files or our private data
 <FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*)$>
   <IfModule mod_version.c>
-    <IfVersion <= 2.2>
+    <IfVersion < 2.4>
      Deny from all
     </IfVersion>
-    <IfVersion > 2.2>
+    <IfVersion >= 2.4>
       Require all denied
     </IfVersion>
   </IfModule>
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index f84acce847..eaca1f8b4d 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -44,10 +44,10 @@ use constant HT_DEFAULT_DENY => <<EOT;
 # nothing in this directory is retrievable unless overridden by an .htaccess
 # in a subdirectory
 <IfModule mod_version.c>
-  <IfVersion <= 2.2>
+  <IfVersion < 2.4>
     Deny from all
   </IfVersion>
-  <IfVersion > 2.2>
+  <IfVersion >= 2.4>
     Require all denied
   </IfVersion>
 </IfModule>
@@ -340,10 +340,10 @@ EOT
 # Allow access to .png and .gif files.
 <FilesMatch (\\.gif|\\.png)\$>
   <IfModule mod_version.c>
-    <IfVersion <= 2.2>
+    <IfVersion < 2.4>
       Allow from all
     </IfVersion>
-    <IfVersion > 2.2>
+    <IfVersion >= 2.4>
       Require all granted
     </IfVersion>
   </IfModule>
@@ -354,10 +354,10 @@ EOT
 
 # And no directory listings, either.
 <IfModule mod_version.c>
-  <IfVersion <= 2.2>
+  <IfVersion < 2.4>
     Deny from all
   </IfVersion>
-  <IfVersion > 2.2>
+  <IfVersion >= 2.4>
     Require all denied
   </IfVersion>
 </IfModule>
@@ -373,14 +373,14 @@ EOT
 # webdot server, you'll need to edit this
 <FilesMatch \\.dot\$>
   <IfModule mod_version.c>
-    <IfVersion <= 2.2>
+    <IfVersion < 2.4>
       Allow from 192.20.225.0/24
       Deny from all
     </IfVersion>
-    <IfVersion > 2.2>
+    <IfVersion >= 2.4>
       Require ip 192.20.225.0/24
       Require all denied
-   </IfVersion>
+    </IfVersion>
   </IfModule>
   <IfModule !mod_version.c>
     Allow from 192.20.225.0/24
@@ -391,10 +391,10 @@ EOT
 # Allow access to .png files created by a local copy of 'dot'
 <FilesMatch \\.png\$>
   <IfModule mod_version.c>
-    <IfVersion <= 2.2>
+    <IfVersion < 2.4>
       Allow from all
     </IfVersion>
-    <IfVersion > 2.2>
+    <IfVersion >= 2.4>
       Require all granted
     </IfVersion>
   </IfModule>
@@ -405,10 +405,10 @@ EOT
 
 # And no directory listings, either.
 <IfModule mod_version.c>
-  <IfVersion <= 2.2>
+  <IfVersion < 2.4>
     Deny from all
   </IfVersion>
-  <IfVersion > 2.2>
+  <IfVersion >= 2.4>
     Require all denied
   </IfVersion>
 </IfModule>