Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
This commit is contained in:
Christopher Jones 2013-11-15 12:38:18 -08:00
commit 3e4e173296

View File

@ -275,6 +275,42 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = {
{ "webm", "video/webm" },
{ "ogv", "video/ogg" },
{ "ogg", "audio/ogg" },
{ "3gp", "video/3gpp" }, /* This is standard video format used for MMS in phones */
{ "apk", "application/vnd.android.package-archive" },
{ "avi", "video/x-msvideo" },
{ "bmp", "image/x-ms-bmp" },
{ "csv", "text/comma-separated-values" },
{ "doc", "application/msword" },
{ "docx", "application/msword" },
{ "flac", "audio/flac" },
{ "gz", "application/x-gzip" },
{ "gzip", "application/x-gzip" },
{ "ics", "text/calendar" },
{ "kml", "application/vnd.google-earth.kml+xml" },
{ "kmz", "application/vnd.google-earth.kmz" },
{ "m4a", "audio/mp4" },
{ "mp3", "audio/mpeg" },
{ "mp4", "video/mp4" },
{ "mpg", "video/mpeg" },
{ "mpeg", "video/mpeg" },
{ "mov", "video/quicktime" },
{ "odp", "application/vnd.oasis.opendocument.presentation" },
{ "ods", "application/vnd.oasis.opendocument.spreadsheet" },
{ "odt", "application/vnd.oasis.opendocument.text" },
{ "oga", "audio/ogg" },
{ "pdf", "application/pdf" },
{ "pptx", "application/vnd.ms-powerpoint" },
{ "pps", "application/vnd.ms-powerpoint" },
{ "qt", "video/quicktime" },
{ "swf", "application/x-shockwave-flash" },
{ "tar", "application/x-tar" },
{ "text", "text/plain" },
{ "tif", "image/tiff" },
{ "wav", "audio/wav" },
{ "wmv", "video/x-ms-wmv" },
{ "xls", "application/vnd.ms-excel" },
{ "xlsx", "application/vnd.ms-excel" },
{ "zip", "application/x-zip-compressed" },
{ NULL, NULL }
};