diff options
| author | Anatol Belski <ab@php.net> | 2014-04-16 09:50:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-16 09:50:24 +0200 |
| commit | 0ffdcfe7560b505ed5b4fd8f3fede1e952ed7a8a (patch) | |
| tree | bec5426dd068426732e52235b95800c002a67355 /sapi | |
| parent | 59d50b5fb017952331b2281f246e27f190e15791 (diff) | |
| parent | d0e10dbde04392973cc1d8f34cfe5d8955ff1131 (diff) | |
| download | php-git-0ffdcfe7560b505ed5b4fd8f3fede1e952ed7a8a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #67079 Missing MIME types for XML/XSL files
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 2c68fa17a4..e9bc9dcdc0 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -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 } }; |