Changeset 2837 for trunk/server

Timestamp:

Apr 10, 2017, 4:56:03 AM (7 years ago)

Author:

andersk

Message:

Improve Content-Type and Content-Encoding headers

Since Chrome has started decompressing tarballs served with
Content-Encoding: x-gzip on download, we don’t want to be sending that
by default.

Remove all the custom AddType and AddEncoding directives from
httpd.conf (let it pick up MIME types from /etc/mime.types).  Do not
set Content-Encoding in static-cat, and fix some of the hard-coded
MIME types there.

Location:

trunk/server

Files:

• common/oursrc/scripts-static-cat/StaticCat.hs (modified) (5 diffs)
• fedora/config/etc/httpd/conf/httpd.conf (modified) (3 diffs)

trunk/server/common/oursrc/scripts-static-cat/StaticCat.hs

@@ -23 +23 @@
 import System.Posix.Handle
 
-encodings :: M.Map String String
-encodings = M.fromList [
-             (".bz2", "bzip2"),
-             (".gz", "gzip"),
-             (".z", "compress")
-            ]
-
 types :: M.Map String String
 types = M.fromList [
@@ -49 +42 @@
          (".jpeg", "image/jpeg"),
          (".jpg", "image/jpeg"),
-         (".js", "application/x-javascript"),
+         (".js", "application/javascript"),
          (".mid", "audio/midi"),
          (".midi", "audio/midi"),
@@ -88 +81 @@
          (".swf", "application/x-shockwave-flash"),
          (".tar", "application/x-tar"),
-         (".tgz", "application/x-gzip"),
+         (".tgz", "application/gzip"),
          (".tif", "image/tiff"),
          (".tiff", "image/tiff"),
@@ -109 +102 @@
          (".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"),
          (".xml", "text/xml"),
-         (".xsl", "text/xml"),
+         (".xsl", "application/xslt+xml"),
          (".zip", "application/zip")
         ]
@@ -126 +119 @@
 
 checkExtension :: FilePath -> CGI ()
-checkExtension file = do
-  let (base, ext) = splitExtension file
-  ext' <- case M.lookup (map toLower ext) encodings of
-            Nothing -> return ext
-            Just e -> do
-              setHeader "Content-Encoding" e
-              return $ takeExtension base
-
-  case M.lookup (map toLower ext') types of
+checkExtension file =
+  case M.lookup (map toLower (takeExtension file)) types of
     Nothing -> throw Forbidden
     Just t -> setHeader "Content-Type" t

trunk/server/fedora/config/etc/httpd/conf/httpd.conf

@@ -218 +218 @@
 
 <IfModule mod_mime.c>
-    AddType application/xhtml+xml         .xhtml
-    AddType application/http-index-format .hti
-    AddType text/html                     .html
-    AddType text/css                      .css
-    AddType text/xsl                      .xslt
-    AddType application/x-javascript      .js
-    AddType application/xml               .xml
-    AddType image/svg+xml                 .svg
-    AddType application/vnd.mozilla.xul+xml .xul
-    AddType application/rdf+xml             .rdf
-    AddType application/x-xpinstall         .xpi
-    AddType text/xml .xsl
-    AddType text/html .shtml
     AddHandler server-parsed .shtml
-
-    AddEncoding x-compress Z
-    AddEncoding x-gzip gz tgz
 
     AddLanguage da .dk
@@ -259 +243 @@
         LanguagePriority en da nl et fr de el it ja pl pt pt-br ltz ca es sv
     </IfModule>
-
-    AddType application/x-tar .tgz
-    AddType image/bmp .bmp
-
-    AddType text/x-hdml .hdml
 </IfModule>
 
@@ -318 +297 @@
     Listen 443
     Listen 444
-
-    AddType application/x-x509-ca-cert .crt
-    AddType application/x-pkcs7-crl    .crl
 
     # This directive allows insecure renegotiations to succeed for browsers