diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 11:28:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 11:28:49 +0200 |
| commit | 4af6270d0fb90a918841d63186497888ffb92bbb (patch) | |
| tree | 4da87e821074abf0b8ff5ed923f56b321ca0bba2 | |
| parent | f617aff182f5f291d5b7d0ff854abea12a04cb0b (diff) | |
| download | forums-4af6270d0fb90a918841d63186497888ffb92bbb.tar forums-4af6270d0fb90a918841d63186497888ffb92bbb.tar.gz forums-4af6270d0fb90a918841d63186497888ffb92bbb.tar.bz2 forums-4af6270d0fb90a918841d63186497888ffb92bbb.tar.xz forums-4af6270d0fb90a918841d63186497888ffb92bbb.zip | |
[ticket/11912] Improve extension map in content_guesser
PHPBB3-11912
| -rw-r--r-- | phpBB/phpbb/mimetype/content_guesser.php | 181 |
1 files changed, 91 insertions, 90 deletions
diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php index 4eeac75499..e6554666fc 100644 --- a/phpBB/phpbb/mimetype/content_guesser.php +++ b/phpBB/phpbb/mimetype/content_guesser.php @@ -61,12 +61,12 @@ class content_guesser 'asf' => 'video/x-ms-asf', 'asm' => 'text/x-asm', 'asp' => 'text/asp', - 'asx' => 'application/x-mplayer2', - 'au' => 'audio/basic', - 'avi' => 'application/x-troff-msvideo', + 'asx' => 'video/x-ms-asf', + 'au' => 'audio/x-au', + 'avi' => 'video/avi', 'avs' => 'video/avs-video', 'bcpio' => 'application/x-bcpio', - 'bin' => 'application/mac-binary', + 'bin' => 'application/x-binary', 'bm' => 'image/bmp', 'bmp' => 'image/bmp', 'boo' => 'application/book', @@ -75,14 +75,14 @@ class content_guesser 'bsh' => 'application/x-bsh', 'bz' => 'application/x-bzip', 'bz2' => 'application/x-bzip2', - 'c' => 'text/plain', - 'c++' => 'text/plain', + 'c' => 'text/x-c', + 'c++' => 'text/x-c', 'cat' => 'application/vnd.ms-pki.seccat', 'cc' => 'text/plain', 'ccad' => 'application/clariscad', 'cco' => 'application/x-cocoa', 'cdf' => 'application/cdf', - 'cer' => 'application/pkix-cert', + 'cer' => 'application/x-x509-ca-cert', 'cha' => 'application/x-chat', 'chat' => 'application/x-chat', 'class' => 'application/java', @@ -90,11 +90,11 @@ class content_guesser 'conf' => 'text/plain', 'cpio' => 'application/x-cpio', 'cpp' => 'text/x-c', - 'cpt' => 'application/mac-compactpro', - 'crl' => 'application/pkcs-crl', - 'crt' => 'application/pkix-cert', + 'cpt' => 'application/x-cpt', + 'crl' => 'application/pkix-crl', + 'crt' => 'application/x-x509-ca-cert', 'csh' => 'application/x-csh', - 'css' => 'application/x-pointplus', + 'css' => 'text/css', 'cxx' => 'text/plain', 'dcr' => 'application/x-director', 'deepv' => 'application/x-deepv', @@ -110,52 +110,52 @@ class content_guesser 'dump' => 'application/octet-stream', 'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi', - 'dwf' => 'drawing/x-dwf (old)', - 'dwg' => 'application/acad', - 'dxf' => 'application/dxf', + 'dwf' => 'model/vnd.dwf', + 'dwg' => 'image/x-dwg', + 'dxf' => 'image/x-dwg', 'dxr' => 'application/x-director', 'el' => 'text/x-script.elisp', - 'elc' => 'application/x-bytecode.elisp (compiled elisp)', + 'elc' => 'application/x-elc', 'env' => 'application/x-envoy', 'eps' => 'application/postscript', 'es' => 'application/x-esrehber', 'etx' => 'text/x-setext', - 'evy' => 'application/envoy', + 'evy' => 'application/x-envoy', 'exe' => 'application/octet-stream', - 'f' => 'text/plain', + 'f' => 'text/x-fortran', 'f77' => 'text/x-fortran', - 'f90' => 'text/plain', + 'f90' => 'text/x-fortran', 'fdf' => 'application/vnd.fdf', - 'fif' => 'application/fractals', - 'fli' => 'video/fli', + 'fif' => 'image/fif', + 'fli' => 'video/x-fli', 'flo' => 'image/florian', 'flx' => 'text/vnd.fmi.flexstor', 'fmf' => 'video/x-atomic3d-feature', - 'for' => 'text/plain', + 'for' => 'text/x-fortran', 'fpx' => 'image/vnd.fpx', 'frl' => 'application/freeloader', 'funk' => 'audio/make', 'g' => 'text/plain', 'g3' => 'image/g3fax', 'gif' => 'image/gif', - 'gl' => 'video/gl', + 'gl' => 'video/x-gl', 'gsd' => 'audio/x-gsm', 'gsm' => 'audio/x-gsm', 'gsp' => 'application/x-gsp', 'gss' => 'application/x-gss', 'gtar' => 'application/x-gtar', - 'gz' => 'application/x-compressed', + 'gz' => 'application/x-gzip', 'gzip' => 'application/x-gzip', - 'h' => 'text/plain', + 'h' => 'text/x-h', 'hdf' => 'application/x-hdf', 'help' => 'application/x-helpfile', 'hgl' => 'application/vnd.hp-hpgl', - 'hh' => 'text/plain', + 'hh' => 'text/x-h', 'hlb' => 'text/x-script', 'hlp' => 'application/hlp', 'hpg' => 'application/vnd.hp-hpgl', 'hpgl' => 'application/vnd.hp-hpgl', - 'hqx' => 'application/binhex', + 'hqx' => 'application/x-binhex40', 'hta' => 'application/hta', 'htc' => 'text/x-component', 'htm' => 'text/html', @@ -182,7 +182,8 @@ class content_guesser 'ivy' => 'application/x-livescreen', 'jam' => 'audio/x-jam', 'jav' => 'text/plain', - 'java' => 'text/plain', + 'jav' => 'text/x-java-source', + 'java' => 'text/x-java-source', 'jcm' => 'application/x-java-commerce', 'jfif' => 'image/jpeg', 'jfif-tbnl' => 'image/jpeg', @@ -193,22 +194,22 @@ class content_guesser 'js' => 'application/x-javascript', 'jut' => 'image/jutvision', 'kar' => 'audio/midi', - 'ksh' => 'application/x-ksh', - 'la' => 'audio/nspaudio', + 'ksh' => 'text/x-script.ksh', + 'la' => 'audio/x-nspaudio', 'lam' => 'audio/x-liveaudio', 'latex' => 'application/x-latex', - 'lha' => 'application/lha', + 'lha' => 'application/x-lha', 'lhx' => 'application/octet-stream', 'list' => 'text/plain', - 'lma' => 'audio/nspaudio', + 'lma' => 'audio/x-nspaudio', 'log' => 'text/plain', - 'lsp' => 'application/x-lisp', + 'lsp' => 'text/x-script.lisp', 'lst' => 'text/plain', 'lsx' => 'text/x-la-asf', 'ltx' => 'application/x-latex', - 'lzh' => 'application/octet-stream', - 'lzx' => 'application/lzx', - 'm' => 'text/plain', + 'lzh' => 'application/x-lzh', + 'lzx' => 'application/x-lzx', + 'm' => 'text/x-m', 'm1v' => 'video/mpeg', 'm2a' => 'audio/mpeg', 'm2v' => 'video/mpeg', @@ -218,31 +219,31 @@ class content_guesser 'mar' => 'text/plain', 'mbd' => 'application/mbedlet', 'mc$' => 'application/x-magic-cap-package-1.0', - 'mcd' => 'application/mcad', - 'mcf' => 'image/vasa', + 'mcd' => 'application/x-mathcad', + 'mcf' => 'text/mcf', 'mcp' => 'application/netmc', 'me' => 'application/x-troff-me', 'mht' => 'message/rfc822', 'mhtml' => 'message/rfc822', - 'mid' => 'application/x-midi', - 'midi' => 'application/x-midi', - 'mif' => 'application/x-frame', - 'mime' => 'message/rfc822', + 'mid' => 'audio/x-midi', + 'midi' => 'audio/x-midi', + 'mif' => 'application/x-mif', + 'mime' => 'www/mime', 'mjf' => 'audio/x-vnd.audioexplosion.mjuicemediafile', 'mjpg' => 'video/x-motion-jpeg', - 'mm' => 'application/base64', + 'mm' => 'application/x-meme', 'mme' => 'application/base64', - 'mod' => 'audio/mod', + 'mod' => 'audio/x-mod', 'moov' => 'video/quicktime', 'mov' => 'video/quicktime', 'movie' => 'video/x-sgi-movie', - 'mp2' => 'audio/mpeg', - 'mp3' => 'audio/mpeg3', + 'mp2' => 'audio/x-mpeg', + 'mp3' => 'audio/x-mpeg-3', 'mpa' => 'audio/mpeg', 'mpc' => 'application/x-project', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', - 'mpg' => 'audio/mpeg', + 'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg', 'mpp' => 'application/vnd.ms-project', 'mpt' => 'application/x-project', @@ -268,34 +269,34 @@ class content_guesser 'omcd' => 'application/x-omcdatamaker', 'omcr' => 'application/x-omcregerator', 'p' => 'text/x-pascal', - 'p10' => 'application/pkcs10', - 'p12' => 'application/pkcs-12', + 'p10' => 'application/x-pkcs10', + 'p12' => 'application/x-pkcs12', 'p7a' => 'application/x-pkcs7-signature', - 'p7c' => 'application/pkcs7-mime', - 'p7m' => 'application/pkcs7-mime', + 'p7c' => 'application/x-pkcs7-mime', + 'p7m' => 'application/x-pkcs7-mime', 'p7r' => 'application/x-pkcs7-certreqresp', 'p7s' => 'application/pkcs7-signature', 'part' => 'application/pro_eng', 'pas' => 'text/pascal', 'pbm' => 'image/x-portable-bitmap', - 'pcl' => 'application/vnd.hp-pcl', + 'pcl' => 'application/x-pcl', 'pct' => 'image/x-pict', 'pcx' => 'image/x-pcx', 'pdb' => 'chemical/x-pdb', 'pdf' => 'application/pdf', - 'pfunk' => 'audio/make', - 'pgm' => 'image/x-portable-graymap', + 'pfunk' => 'audio/make.my.funk', + 'pgm' => 'image/x-portable-greymap', 'pic' => 'image/pict', 'pict' => 'image/pict', 'pkg' => 'application/x-newton-compatible-pkg', 'pko' => 'application/vnd.ms-pki.pko', - 'pl' => 'text/plain', + 'pl' => 'text/x-script.perl', 'plx' => 'application/x-pixclscript', - 'pm' => 'image/x-xpixmap', + 'pm' => 'text/x-script.perl-module', 'pm4' => 'application/x-pagemaker', 'pm5' => 'application/x-pagemaker', 'png' => 'image/png', - 'pnm' => 'application/x-portable-anymap', + 'pnm' => 'image/x-portable-anymap', 'pot' => 'application/mspowerpoint', 'pov' => 'model/x-pov', 'ppa' => 'application/vnd.ms-powerpoint', @@ -319,43 +320,43 @@ class content_guesser 'qtc' => 'video/x-qtc', 'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime', - 'ra' => 'audio/x-pn-realaudio', + 'ra' => 'audio/x-realaudio', 'ram' => 'audio/x-pn-realaudio', - 'ras' => 'application/x-cmu-raster', + 'ras' => 'image/x-cmu-raster', 'rast' => 'image/cmu-raster', 'rexx' => 'text/x-script.rexx', 'rf' => 'image/vnd.rn-realflash', 'rgb' => 'image/x-rgb', - 'rm' => 'application/vnd.rn-realmedia', + 'rm' => 'audio/x-pn-realaudio', 'rmi' => 'audio/mid', 'rmm' => 'audio/x-pn-realaudio', 'rmp' => 'audio/x-pn-realaudio', - 'rng' => 'application/ringing-tones', + 'rng' => 'application/vnd.nokia.ringing-tone', 'rnx' => 'application/vnd.rn-realplayer', 'roff' => 'application/x-troff', 'rp' => 'image/vnd.rn-realpix', 'rpm' => 'audio/x-pn-realaudio-plugin', 'rt' => 'text/richtext', - 'rtf' => 'application/rtf', - 'rtx' => 'application/rtf', + 'rtf' => 'text/richtext', + 'rtx' => 'text/richtext', 'rv' => 'video/vnd.rn-realvideo', 's' => 'text/x-asm', 's3m' => 'audio/s3m', 'saveme' => 'application/octet-stream', 'sbk' => 'application/x-tbook', - 'scm' => 'application/x-lotusscreencam', + 'scm' => 'video/x-scm', 'sdml' => 'text/plain', - 'sdp' => 'application/sdp', + 'sdp' => 'application/x-sdp', 'sdr' => 'application/sounder', - 'sea' => 'application/sea', + 'sea' => 'application/x-sea', 'set' => 'application/set', - 'sgm' => 'text/sgml', - 'sgml' => 'text/sgml', - 'sh' => 'application/x-bsh', - 'shar' => 'application/x-bsh', - 'shtml' => 'text/html', + 'sgm' => 'text/x-sgml', + 'sgml' => 'text/x-sgml', + 'sh' => 'text/x-script.sh', + 'shar' => 'application/x-shar', + 'shtml' => 'text/x-server-parsed-html', 'sid' => 'audio/x-psid', - 'sit' => 'application/x-sit', + 'sit' => 'application/x-stuffit', 'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 'skp' => 'application/x-koan', @@ -363,9 +364,9 @@ class content_guesser 'sl' => 'application/x-seelogo', 'smi' => 'application/smil', 'smil' => 'application/smil', - 'snd' => 'audio/basic', + 'snd' => 'audio/x-adpcm', 'sol' => 'application/solids', - 'spc' => 'application/x-pkcs7-certificates', + 'spc' => 'text/x-speech', 'spl' => 'application/futuresplash', 'spr' => 'application/x-sprite', 'sprite' => 'application/x-sprite', @@ -374,29 +375,29 @@ class content_guesser 'ssm' => 'application/streamingmedia', 'sst' => 'application/vnd.ms-pki.certstore', 'step' => 'application/step', - 'stl' => 'application/sla', + 'stl' => 'application/vnd.ms-pki.stl', 'stp' => 'application/step', 'sv4cpio' => 'application/x-sv4cpio', 'sv4crc' => 'application/x-sv4crc', - 'svf' => 'image/vnd.dwg', + 'svf' => 'image/x-dwg', 'svr' => 'application/x-world', 'swf' => 'application/x-shockwave-flash', 't' => 'application/x-troff', 'talk' => 'text/x-speech', 'tar' => 'application/x-tar', - 'tbk' => 'application/toolbook', - 'tcl' => 'application/x-tcl', + 'tbk' => 'application/x-tbook', + 'tcl' => 'text/x-script.tcl', 'tcsh' => 'text/x-script.tcsh', 'tex' => 'application/x-tex', 'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', - 'text' => 'application/plain', - 'tgz' => 'application/gnutar', + 'text' => 'text/plain', + 'tgz' => 'application/x-compressed', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'tr' => 'application/x-troff', 'tsi' => 'audio/tsp-audio', - 'tsp' => 'application/dsptype', + 'tsp' => 'audio/tsplayer', 'tsv' => 'text/tab-separated-values', 'turbot' => 'image/florian', 'txt' => 'text/plain', @@ -406,8 +407,8 @@ class content_guesser 'unv' => 'application/i-deas', 'uri' => 'text/uri-list', 'uris' => 'text/uri-list', - 'ustar' => 'application/x-ustar', - 'uu' => 'application/octet-stream', + 'ustar' => 'multipart/x-ustar', + 'uu' => 'text/x-uuencode', 'uue' => 'text/x-uuencode', 'vcd' => 'application/x-cdlink', 'vcs' => 'text/x-vcalendar', @@ -450,18 +451,18 @@ class content_guesser 'wpd' => 'application/wordperfect', 'wq1' => 'application/x-lotus', 'wri' => 'application/mswrite', - 'wrl' => 'application/x-world', + 'wrl' => 'model/vrml', 'wrz' => 'model/vrml', 'wsc' => 'text/scriplet', 'wsrc' => 'application/x-wais-source', 'wtk' => 'application/x-wintalk', - 'xbm' => 'image/x-xbitmap', + 'xbm' => 'image/xbm', 'xdr' => 'video/x-amt-demorun', 'xgz' => 'xgl/drawing', 'xif' => 'image/vnd.xiff', 'xl' => 'application/excel', 'xla' => 'application/excel', - 'xlb' => 'application/excel', + 'xlb' => 'application/excel',, 'xlc' => 'application/excel', 'xld' => 'application/excel', 'xlk' => 'application/excel', @@ -472,16 +473,16 @@ class content_guesser 'xlv' => 'application/excel', 'xlw' => 'application/excel', 'xm' => 'audio/xm', - 'xml' => 'application/xml', + 'xml' => 'text/xml', 'xmz' => 'xgl/movie', 'xpix' => 'application/x-vnd.ls-xpix', - 'xpm' => 'image/x-xpixmap', + 'xpm' => 'image/xpm', 'x-png' => 'image/png', 'xsr' => 'video/x-amt-showrun', - 'xwd' => 'image/x-xwd', + 'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-pdb', - 'z' => 'application/x-compress', - 'zip' => 'application/x-compressed', + 'z' => 'application/x-compressed', + 'zip' => 'application/x-zip-compressed', 'zoo' => 'application/octet-stream', 'zsh' => 'text/x-script.zsh', ); |