summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-11-15 12:36:25 -0800
committerChristopher Jones <sixd@php.net>2013-11-15 12:36:25 -0800
commitd0cd1127024410bd7b055500d1bd879c4187b832 (patch)
tree38d427bcd127ab7921a7e2b209b196ea3f5ce104
parentcd6eda5e5f85f34d45622cd97301eac83cc4beab (diff)
downloadphp-git-d0cd1127024410bd7b055500d1bd879c4187b832.tar.gz
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 A router can be used to add to, or override, the MIME type lookups, see http://php.net/manual/en/features.commandline.webserver.php
-rw-r--r--NEWS3
-rw-r--r--sapi/cli/php_cli_server.c36
2 files changed, 39 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 80e71670c7..f41d23bd50 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2013, PHP 5.5.7
+- CLI server:
+ . Added some MIME types to the CLI web server (Chris Jones)
+
- readline
. Fixed Bug #65714 (PHP cli forces the tty to cooked mode). (Remi)
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 1315a62b87..672111c5d6 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -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 }
};