diff options
| author | Anatol Belski <ab@php.net> | 2014-04-20 20:39:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-20 20:39:29 +0200 |
| commit | 7c6ac6be55194a68aa140686d28a8baeca49c79a (patch) | |
| tree | 60352f9f5c07646b00da4bd957c93da7c103a305 /sapi/cli/php_cli_server.c | |
| parent | c0faf60be0419f8d18a4298cf14b72a09dbe108e (diff) | |
| parent | 3eaf40c3fcc264e751440c3d3d2374e3e33874c4 (diff) | |
| download | php-git-7c6ac6be55194a68aa140686d28a8baeca49c79a.tar.gz | |
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (23 commits)
updated libs versions
added some notes about the win build system
UPGRADING note about bug #67072
UPGRADING note about bug #67072
UPGRADING note about bug #67072
refixed the test related to bug #67072
Improved the fix for bug #67072, thanks Nikita
Fixed test case for 5328d42
These links to ~helly don't work anymore.
updated NEWS
updated NEWS
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
updated UPGRADING
updated UPGRADING
correct the bug #67081 fix
updated NEWS
updated NEWS
Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
updated NEWS
Fixed bug #67079 Missing MIME types for XML/XSL files
...
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -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 a36f102591..e0c4837d76 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 } }; |