Bug 586244: Make mod_headers and mod_expires optional

r=glob, a=mkanat

1 files changed, 21 insertions, 11 deletions

diff --git a/.htaccess b/.htaccess
index d4436e563..4b06fe9a9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,14 +2,24 @@
 <FilesMatch ^(.*\.pm|.*\.pl|.*localconfig.*)$>
   deny from all
 </FilesMatch>
-<FilesMatch (\.js|\.css)$>
-  ExpiresActive On
-  # According to RFC 2616, "1 year in the future" means "never expire".
-  # We change the name of the file's URL whenever its modification date
-  # changes, so browsers can cache any individual JS or CSS URL forever.
-  # However, since all JS and CSS URLs involve a ? in them (for the changing
-  # name) we have to explicitly set an Expires header or browsers won't
-  # *ever* cache them.
-  ExpiresDefault "now plus 1 years"
-  Header append Cache-Control "public"
-</FilesMatch>
+<IfModule mod_expires.c>
+<IfModule mod_headers.c>
+<IfModule mod_env.c>
+  <FilesMatch (\.js|\.css)$>
+    ExpiresActive On
+    # According to RFC 2616, "1 year in the future" means "never expire".
+    # We change the name of the file's URL whenever its modification date
+    # changes, so browsers can cache any individual JS or CSS URL forever.
+    # However, since all JS and CSS URLs involve a ? in them (for the changing
+    # name) we have to explicitly set an Expires header or browsers won't
+    # *ever* cache them.
+    ExpiresDefault "now plus 1 years"
+    Header append Cache-Control "public"
+  </FilesMatch>
+
+  # This lets Bugzilla know that we are properly sending Cache-Control
+  # and Expires headers for CSS and JS files.
+  SetEnv BZ_CACHE_CONTROL 1
+</IfModule>
+</IfModule>
+</IfModule>