diff options
| author | Lars Strojny <lstrojny@php.net> | 2012-12-14 14:56:25 +0100 |
|---|---|---|
| committer | Lars Strojny <lstrojny@php.net> | 2012-12-14 14:56:25 +0100 |
| commit | aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214 (patch) | |
| tree | f9c126c5efd31e2d184b7f2c9fb93f15dd90da54 /sapi/cli/php_cli_server.c | |
| parent | a73a6be76417571e7e4a467e8d9c7f82e8a45a9c (diff) | |
| parent | c3b480323f78cfd756ef59d6ec0c98252fd9b5b3 (diff) | |
| download | php-git-aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index d0d4cefb90..9fc2817c27 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -259,10 +259,13 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = { { "gif", "image/gif" }, { "jpg", "image/jpeg" }, { "jpeg", "image/jpeg" }, - { "png", "image/png" }, { "jpe", "image/jpeg" }, + { "png", "image/png" }, { "svg", "image/svg+xml" }, { "txt", "text/plain" }, + { "webm", "video/webm" }, + { "ogv", "video/ogg" }, + { "ogg", "audio/ogg" }, { NULL, NULL } }; |