summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-09-19 20:23:18 -0700
committerChristopher Jones <sixd@php.net>2013-09-19 20:23:18 -0700
commitdcafcd01a9c52ab31e013eddc58a308b0e0e105b (patch)
tree442890bd653e91061b7f79f1db6650bba49aefbb /sapi/cli/php_cli_server.c
parentd879d3de1e51ae1e7a5dd09a554c35638dd0836c (diff)
parentdfa43d55dd996fb06c7bb4d5efcae3fc78131cdc (diff)
downloadphp-git-dcafcd01a9c52ab31e013eddc58a308b0e0e105b.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Added application/pdf to PHP CLI Web Server mime types.
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r--sapi/cli/php_cli_server.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 5e0f6e955a..4a9ee3dc6a 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -268,6 +268,7 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = {
{ "jpg", "image/jpeg" },
{ "jpeg", "image/jpeg" },
{ "jpe", "image/jpeg" },
+ { "pdf", "application/pdf" },
{ "png", "image/png" },
{ "svg", "image/svg+xml" },
{ "txt", "text/plain" },