Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67079 Missing MIME types for XML/XSL files
This commit is contained in:
Anatol Belski 2014-04-16 09:48:31 +02:00
commit b4c238c8cf

View File

@ -312,6 +312,9 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = {
{ "xls", "application/vnd.ms-excel" },
{ "xlsx", "application/vnd.ms-excel" },
{ "zip", "application/x-zip-compressed" },
{ "xml", "application/xml" },
{ "xsl", "application/xml" },
{ "xsd", "application/xml" },
{ NULL, NULL }
};