Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "sort the mimeTypes map alphabetically"

This reverts commit 90ae2df.

The mime type is used by CakeResponse::mapType to determine which mime
type maps to which alias. As this is done in the order of the mimetype
map the mimetype map is order sensitive.
  • Loading branch information...
commit 790a53d7945a57f22876d907cbb835043cf54fc0 1 parent 1758dd1
Andy Dawson AD7six authored
Showing with 115 additions and 115 deletions.
  1. +115 −115 lib/Cake/Network/CakeResponse.php
230 lib/Cake/Network/CakeResponse.php
View
@@ -81,31 +81,18 @@ class CakeResponse {
*/
protected $_mimeTypes = array(
'html' => array('text/html', '*/*'),
- '7z' => 'application/x-7z-compressed',
- 'aac' => 'audio/aac',
+ 'json' => 'application/json',
+ 'xml' => array('application/xml', 'text/xml'),
+ 'rss' => 'application/rss+xml',
'ai' => 'application/postscript',
- 'aif' => 'audio/x-aiff',
- 'aifc' => 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'amf' => 'application/x-amf',
- 'appcache' => 'text/cache-manifest',
- 'asc' => 'text/plain',
- 'atom' => 'application/atom+xml',
- 'au' => 'audio/basic',
- 'avi' => 'video/x-msvideo',
'bcpio' => 'application/x-bcpio',
'bin' => 'application/octet-stream',
- 'bz2' => 'application/x-bzip',
- 'c' => 'text/plain',
- 'cc' => 'text/plain',
'ccad' => 'application/clariscad',
'cdf' => 'application/x-netcdf',
'class' => 'application/octet-stream',
'cpio' => 'application/x-cpio',
'cpt' => 'application/mac-compactpro',
- 'crx' => 'application/x-chrome-extension',
'csh' => 'application/x-csh',
- 'css' => 'text/css',
'csv' => array('text/csv', 'application/vnd.ms-excel', 'text/plain'),
'dcr' => 'application/x-director',
'dir' => 'application/x-director',
@@ -118,111 +105,44 @@ class CakeResponse {
'dxr' => 'application/x-director',
'eot' => 'application/vnd.ms-fontobject',
'eps' => 'application/postscript',
- 'etx' => 'text/x-setext',
'exe' => 'application/octet-stream',
'ez' => 'application/andrew-inset',
- 'f' => 'text/plain',
- 'f4a' => 'audio/mp4',
- 'f4b' => 'audio/mp4',
- 'f4p' => 'video/mp4',
- 'f4v' => 'video/mp4',
- 'f90' => 'text/plain',
- 'file' => 'multipart/form-data',
- 'fli' => 'video/x-fli',
'flv' => 'video/x-flv',
- 'form' => 'application/x-www-form-urlencoded',
- 'gif' => 'image/gif',
'gtar' => 'application/x-gtar',
'gz' => 'application/x-gzip',
- 'h' => 'text/plain',
+ 'bz2' => 'application/x-bzip',
+ '7z' => 'application/x-7z-compressed',
'hdf' => 'application/x-hdf',
- 'hh' => 'text/plain',
'hqx' => 'application/mac-binhex40',
- 'htc' => 'text/x-component',
- 'htm' => array('text/html', '*/*'),
- 'ice' => 'x-conference/x-cooltalk',
'ico' => 'image/x-icon',
- 'ics' => 'text/calendar',
- 'ief' => 'image/ief',
- 'iges' => 'model/iges',
- 'igs' => 'model/iges',
'ips' => 'application/x-ipscript',
'ipx' => 'application/x-ipix',
- 'javascript' => 'application/javascript',
- 'jpe' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
- 'jpg' => 'image/jpeg',
'js' => 'application/javascript',
- 'json' => 'application/json',
- 'kar' => 'audio/midi',
'latex' => 'application/x-latex',
'lha' => 'application/octet-stream',
'lsp' => 'application/x-lisp',
'lzh' => 'application/octet-stream',
- 'm' => 'text/plain',
- 'm4a' => 'audio/mp4',
- 'm4v' => 'video/mp4',
'man' => 'application/x-troff-man',
- 'manifest' => 'text/cache-manifest',
'me' => 'application/x-troff-me',
- 'mesh' => 'model/mesh',
- 'mid' => 'audio/midi',
- 'midi' => 'audio/midi',
'mif' => 'application/vnd.mif',
- 'mime' => 'www/mime',
- 'mov' => 'video/quicktime',
- 'movie' => 'video/x-sgi-movie',
- 'mp2' => 'audio/mpeg',
- 'mp3' => 'audio/mpeg',
- 'mp4' => 'video/mp4',
- 'mpe' => 'video/mpeg',
- 'mpeg' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'mpga' => 'audio/mpeg',
'ms' => 'application/x-troff-ms',
- 'msh' => 'model/mesh',
'nc' => 'application/x-netcdf',
'oda' => 'application/oda',
- 'oex' => 'application/x-opera-extension',
- 'oga' => 'audio/ogg',
- 'ogg' => 'audio/ogg',
- 'ogv' => 'video/ogg',
'otf' => 'font/otf',
- 'pbm' => 'image/x-portable-bitmap',
- 'pdb' => 'chemical/x-pdb',
'pdf' => 'application/pdf',
- 'pgm' => 'image/x-portable-graymap',
'pgn' => 'application/x-chess-pgn',
- 'png' => 'image/png',
- 'pnm' => 'image/x-portable-anymap',
'pot' => 'application/mspowerpoint',
- 'ppm' => 'image/x-portable-pixmap',
'pps' => 'application/mspowerpoint',
'ppt' => 'application/mspowerpoint',
'ppz' => 'application/mspowerpoint',
'pre' => 'application/x-freelance',
'prt' => 'application/pro_eng',
'ps' => 'application/postscript',
- 'qt' => 'video/quicktime',
- 'ra' => 'audio/x-realaudio',
- 'ram' => 'audio/x-pn-realaudio',
- 'ras' => 'image/cmu-raster',
- 'rdf' => 'application/xml',
- 'rgb' => 'image/x-rgb',
- 'rm' => 'audio/x-pn-realaudio',
'roff' => 'application/x-troff',
- 'rpm' => 'audio/x-pn-realaudio-plugin',
- 'rss' => 'application/rss+xml',
- 'rtf' => 'text/rtf',
- 'rtx' => 'text/richtext',
- 'safariextz' => 'application/octet-stream',
'scm' => 'application/x-lotusscreencam',
'set' => 'application/set',
- 'sgm' => 'text/sgml',
- 'sgml' => 'text/sgml',
'sh' => 'application/x-sh',
'shar' => 'application/x-shar',
- 'silo' => 'model/mesh',
'sit' => 'application/x-stuffit',
'skd' => 'application/x-koan',
'skm' => 'application/x-koan',
@@ -230,10 +150,8 @@ class CakeResponse {
'skt' => 'application/x-koan',
'smi' => 'application/smil',
'smil' => 'application/smil',
- 'snd' => 'audio/basic',
'sol' => 'application/solids',
'spl' => 'application/x-futuresplash',
- 'spx' => 'audio/ogg',
'src' => 'application/x-wais-source',
'step' => 'application/STEP',
'stl' => 'application/SLA',
@@ -249,50 +167,132 @@ class CakeResponse {
'tex' => 'application/x-tex',
'texi' => 'application/x-texinfo',
'texinfo' => 'application/x-texinfo',
- 'text' => 'text/plain',
- 'tif' => 'image/tiff',
- 'tiff' => 'image/tiff',
- 'tpl' => 'text/template',
'tr' => 'application/x-troff',
- 'tsi' => 'audio/TSP-audio',
'tsp' => 'application/dsptype',
- 'tsv' => 'text/tab-separated-values',
'ttc' => 'font/ttf',
'ttf' => 'font/ttf',
- 'txt' => 'text/plain',
'unv' => 'application/i-deas',
'ustar' => 'application/x-ustar',
'vcd' => 'application/x-cdlink',
- 'vcf' => 'text/x-vcard',
'vda' => 'application/vda',
- 'viv' => 'video/vnd.vivo',
- 'vivo' => 'video/vnd.vivo',
- 'vrml' => 'model/vrml',
- 'vtt' => 'text/vtt',
- 'wap' => array('text/vnd.wap.wml', 'text/vnd.wap.wmlscript', 'image/vnd.wap.wbmp'),
- 'wav' => 'audio/x-wav',
- 'wbmp' => 'image/vnd.wap.wbmp',
- 'webapp' => 'application/x-web-app-manifest+json',
- 'webm' => 'video/webm',
- 'webp' => 'image/webp',
- 'wml' => 'text/vnd.wap.wml',
- 'wmlscript' => 'text/vnd.wap.wmlscript',
- 'woff' => 'application/x-font-woff',
- 'wrl' => 'model/vrml',
- 'xbm' => 'image/x-xbitmap',
- 'xhtml' => array('application/xhtml+xml', 'application/xhtml', 'text/xhtml'),
- 'xhtml-mobile' => 'application/vnd.wap.xhtml+xml',
'xlc' => 'application/vnd.ms-excel',
'xll' => 'application/vnd.ms-excel',
'xlm' => 'application/vnd.ms-excel',
'xls' => 'application/vnd.ms-excel',
'xlw' => 'application/vnd.ms-excel',
- 'xml' => array('application/xml', 'text/xml'),
- 'xpi' => 'application/x-xpinstall',
+ 'zip' => 'application/zip',
+ 'aif' => 'audio/x-aiff',
+ 'aifc' => 'audio/x-aiff',
+ 'aiff' => 'audio/x-aiff',
+ 'au' => 'audio/basic',
+ 'kar' => 'audio/midi',
+ 'mid' => 'audio/midi',
+ 'midi' => 'audio/midi',
+ 'mp2' => 'audio/mpeg',
+ 'mp3' => 'audio/mpeg',
+ 'mpga' => 'audio/mpeg',
+ 'ogg' => 'audio/ogg',
+ 'oga' => 'audio/ogg',
+ 'spx' => 'audio/ogg',
+ 'ra' => 'audio/x-realaudio',
+ 'ram' => 'audio/x-pn-realaudio',
+ 'rm' => 'audio/x-pn-realaudio',
+ 'rpm' => 'audio/x-pn-realaudio-plugin',
+ 'snd' => 'audio/basic',
+ 'tsi' => 'audio/TSP-audio',
+ 'wav' => 'audio/x-wav',
+ 'aac' => 'audio/aac',
+ 'asc' => 'text/plain',
+ 'c' => 'text/plain',
+ 'cc' => 'text/plain',
+ 'css' => 'text/css',
+ 'etx' => 'text/x-setext',
+ 'f' => 'text/plain',
+ 'f90' => 'text/plain',
+ 'h' => 'text/plain',
+ 'hh' => 'text/plain',
+ 'htm' => array('text/html', '*/*'),
+ 'ics' => 'text/calendar',
+ 'm' => 'text/plain',
+ 'rtf' => 'text/rtf',
+ 'rtx' => 'text/richtext',
+ 'sgm' => 'text/sgml',
+ 'sgml' => 'text/sgml',
+ 'tsv' => 'text/tab-separated-values',
+ 'tpl' => 'text/template',
+ 'txt' => 'text/plain',
+ 'text' => 'text/plain',
+ 'avi' => 'video/x-msvideo',
+ 'fli' => 'video/x-fli',
+ 'mov' => 'video/quicktime',
+ 'movie' => 'video/x-sgi-movie',
+ 'mpe' => 'video/mpeg',
+ 'mpeg' => 'video/mpeg',
+ 'mpg' => 'video/mpeg',
+ 'qt' => 'video/quicktime',
+ 'viv' => 'video/vnd.vivo',
+ 'vivo' => 'video/vnd.vivo',
+ 'ogv' => 'video/ogg',
+ 'webm' => 'video/webm',
+ 'mp4' => 'video/mp4',
+ 'm4v' => 'video/mp4',
+ 'f4v' => 'video/mp4',
+ 'f4p' => 'video/mp4',
+ 'm4a' => 'audio/mp4',
+ 'f4a' => 'audio/mp4',
+ 'f4b' => 'audio/mp4',
+ 'gif' => 'image/gif',
+ 'ief' => 'image/ief',
+ 'jpe' => 'image/jpeg',
+ 'jpeg' => 'image/jpeg',
+ 'jpg' => 'image/jpeg',
+ 'pbm' => 'image/x-portable-bitmap',
+ 'pgm' => 'image/x-portable-graymap',
+ 'png' => 'image/png',
+ 'pnm' => 'image/x-portable-anymap',
+ 'ppm' => 'image/x-portable-pixmap',
+ 'ras' => 'image/cmu-raster',
+ 'rgb' => 'image/x-rgb',
+ 'tif' => 'image/tiff',
+ 'tiff' => 'image/tiff',
+ 'xbm' => 'image/x-xbitmap',
'xpm' => 'image/x-xpixmap',
'xwd' => 'image/x-xwindowdump',
+ 'ice' => 'x-conference/x-cooltalk',
+ 'iges' => 'model/iges',
+ 'igs' => 'model/iges',
+ 'mesh' => 'model/mesh',
+ 'msh' => 'model/mesh',
+ 'silo' => 'model/mesh',
+ 'vrml' => 'model/vrml',
+ 'wrl' => 'model/vrml',
+ 'mime' => 'www/mime',
+ 'pdb' => 'chemical/x-pdb',
'xyz' => 'chemical/x-pdb',
- 'zip' => 'application/zip',
+ 'javascript' => 'application/javascript',
+ 'form' => 'application/x-www-form-urlencoded',
+ 'file' => 'multipart/form-data',
+ 'xhtml' => array('application/xhtml+xml', 'application/xhtml', 'text/xhtml'),
+ 'xhtml-mobile' => 'application/vnd.wap.xhtml+xml',
+ 'atom' => 'application/atom+xml',
+ 'amf' => 'application/x-amf',
+ 'wap' => array('text/vnd.wap.wml', 'text/vnd.wap.wmlscript', 'image/vnd.wap.wbmp'),
+ 'wml' => 'text/vnd.wap.wml',
+ 'wmlscript' => 'text/vnd.wap.wmlscript',
+ 'wbmp' => 'image/vnd.wap.wbmp',
+ 'woff' => 'application/x-font-woff',
+ 'webp' => 'image/webp',
+ 'appcache' => 'text/cache-manifest',
+ 'manifest' => 'text/cache-manifest',
+ 'htc' => 'text/x-component',
+ 'rdf' => 'application/xml',
+ 'crx' => 'application/x-chrome-extension',
+ 'oex' => 'application/x-opera-extension',
+ 'xpi' => 'application/x-xpinstall',
+ 'safariextz' => 'application/octet-stream',
+ 'webapp' => 'application/x-web-app-manifest+json',
+ 'vcf' => 'text/x-vcard',
+ 'vtt' => 'text/vtt',
);
/**
Please sign in to comment.
Something went wrong with that request. Please try again.