Merge commit 'e93782d96473bbebd9618fb5f71bfaad052b79c5'

diff --combined cgilite/file.sh
index 51ec245f2678602a12882d71d39173ff9acd98b1,04a8ef617c9f755a4dcb7c3cf3adeeca69683f27..04a8ef617c9f755a4dcb7c3cf3adeeca69683f27
--- 1/cgilite/file.sh
--- 2/file.sh
+++ b/cgilite/file.sh
@@@ -32,9 -32,14 +32,14 @@@ file_type()
      svg)       printf 'image/svg+xml';;
      gif)       printf 'image/gif';;
      webm)      printf 'video/webm';;
-     mp4)       printf 'video/mp4';;
+     mp4|m4v)   printf 'video/mp4';;
+     m4a)       printf 'audio/mp4';;
      ogg)       printf 'audio/ogg';;
      xml)       printf 'application/xml';;
+     m3u8)      printf 'application/x-mpegURL';;
+     ts)        printf 'video/MP2T';;
+     mpd)       printf 'application/dash+xml';;
+     m4s)       printf 'video/iso.segment';;
      *)         printf 'application/octet-stream';;
    esac
  }