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 14325d152388d3f708f9033ce0b49a2777e94a36..2f009697cc3ed32fc90b5d1fad6412816ddb0207 100644 (file)
--- 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 6d7f14ced987a3a22bdf9a0cb1b96ecf279e7b53..4f133d8656eea787c73b8269fa251b71b11f913c 100644 (file)
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -48,10 +48,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>
@@ -350,10 +350,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>
@@ -364,10 +364,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>
@@ -383,14 +383,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
@@ -401,10 +401,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>
@@ -415,10 +415,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>
@@ -432,10 +432,10 @@ EOT
 # Allow access to .css files
 <FilesMatch \\.(css|js)\$>
   <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>
@@ -446,10 +446,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>