diff options
| author | Anatol Belski <ab@php.net> | 2014-04-16 09:48:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-16 09:48:31 +0200 |
| commit | b4c238c8cf3d8efcb307e18e51863e7eb01f4d32 (patch) | |
| tree | c036c434d51169a21951aaf7b51a21060aa5742a /sapi | |
| parent | ea8370c29ac6940ce4acfe48688dfa2d9745cebd (diff) | |
| parent | 9eb726b3ab2808b3c25ac966388e7d361bfbb21c (diff) | |
| download | php-git-b4c238c8cf3d8efcb307e18e51863e7eb01f4d32.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 3f2aaf0088..5c528a8d9a 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 } }; |