Merge commit '3e23ea79fad3824fcf71532ff605bd753f83c0b3'

diff --combined cgilite/file.sh
index 6f956dfeb5989a6b2542534d78134bc4633217de,0d1f4eabb0b7e80541c9f0271892d25ba888472f..0d1f4eabb0b7e80541c9f0271892d25ba888472f
--- 1/cgilite/file.sh
--- 2/file.sh
+++ b/cgilite/file.sh
@@@ -22,24 -22,27 +22,27 @@@ include_fileserve="$0
  
  file_type(){
    case ${1##*.} in
-     html|html) printf 'text/html';;
      css)       printf 'text/css';;
-     js)        printf 'text/javascript';;
-     txt)       printf 'text/plain';;
-     sh)        printf 'text/shellscript';;
+     gif)       printf 'image/gif';;
+     html|html) printf 'text/html';;
      jpg|jpeg)  printf 'image/jpeg';;
+     js)        printf 'text/javascript';;
+     m3u8)      printf 'application/x-mpegURL';;
+     m4a)       printf 'audio/mp4';;
+     m4s)       printf 'video/iso.segment';;
+     m4v|mp4)   printf 'video/mp4';;
+     mpd)       printf 'application/dash+xml';;
+     ogg)       printf 'audio/ogg';;
+     pdf)       printf 'application/pdf';;
      png)       printf 'image/png';;
+     sh)        printf 'text/x-shellscript';;
      svg)       printf 'image/svg+xml';;
-     gif)       printf 'image/gif';;
+     tex)       printf 'text/x-tex';;
+     txt)       printf 'text/plain';;
+     short)     printf 'text/prs.shorthand';;
+     ts)        printf 'video/MP2T';;
      webm)      printf 'video/webm';;
-     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
  }