Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master: (25 commits)
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
  Update copyright year to 2014
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Remove superfluous echos.
  Remove usage of pointless COOKIE_SET_COOKIE constant.
  Test
  Added support for parsing ssl certificates using GeneralizedTime format.
  Fix align indentation
  ...

Conflicts:
	ext/standard/head.c

11 files changed, 1161 insertions, 92 deletions

diff --git a/NEWS b/NEWS
index f5dbef1d77..50ae046786 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 20??, PHP 5.7.0 
 
+- CLI server:
+  . Refactor MIME type handling to use a hash table instead of linear search.
+    (Adam)
+  . Update the MIME type list from the one shipped by Apache HTTPD. (Adam)
+
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
 
diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt
index 2aa8c1d828..19b5914aa3 100644
--- a/ext/date/tests/bug67118.phpt
+++ b/ext/date/tests/bug67118.phpt
@@ -23,4 +23,4 @@ class mydt extends datetime
 new mydt("Funktionsansvarig rådgivning och juridik", "UTC");
 ?>
 --EXPECTF--
-Fatal error: Call to a member function format() on a non-object in %sbug67118.php on line %d
+Fatal error: Call to a member function format() on null in %sbug67118.php on line %d
diff --git a/ext/session/session.c b/ext/session/session.c
index c746805668..cd88d3e22b 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -51,6 +51,7 @@
 #include "ext/standard/php_smart_str.h"
 #include "ext/standard/url.h"
 #include "ext/standard/basic_functions.h"
+#include "ext/standard/head.h"
 
 #include "mod_files.h"
 #include "mod_user.h"
@@ -1289,14 +1290,6 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */
    * Cookie Management *
    ********************* */
 
-#define COOKIE_SET_COOKIE "Set-Cookie: "
-#define COOKIE_EXPIRES	"; expires="
-#define COOKIE_MAX_AGE	"; Max-Age="
-#define COOKIE_PATH		"; path="
-#define COOKIE_DOMAIN	"; domain="
-#define COOKIE_SECURE	"; secure"
-#define COOKIE_HTTPONLY	"; HttpOnly"
-
 /*
  * Remove already sent session ID cookie.
  * It must be directly removed from SG(sapi_header) because sapi_add_header_ex()
@@ -1362,7 +1355,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */
 	e_session_name = php_url_encode(PS(session_name), strlen(PS(session_name)), NULL);
 	e_id = php_url_encode(PS(id), strlen(PS(id)), NULL);
 
-	smart_str_appends(&ncookie, COOKIE_SET_COOKIE);
+	smart_str_appends(&ncookie, "Set-Cookie: ");
 	smart_str_appends(&ncookie, e_session_name);
 	smart_str_appendc(&ncookie, '=');
 	smart_str_appends(&ncookie, e_id);
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 5c448867f6..2a6b288034 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -124,7 +124,7 @@ PHPAPI int php_setcookie(char *name, php_size_t name_len, char *value, php_size_
 		if (expires > 0) {
 			const char *p;
 			char tsdelta[13];
-			strlcat(cookie, "; expires=", len + 100);
+			strlcat(cookie, COOKIE_EXPIRES, len + 100);
 			dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC);
 			/* check to make sure that the year does not exceed 4 digits in length */
 			p = zend_memrchr(dt, '-', strlen(dt));
@@ -139,7 +139,7 @@ PHPAPI int php_setcookie(char *name, php_size_t name_len, char *value, php_size_
 			efree(dt);
 
 			snprintf(tsdelta, sizeof(tsdelta), "%pd", (php_int_t) difftime(expires, time(NULL)));
-			strlcat(cookie, "; Max-Age=", len + 100);
+			strlcat(cookie, COOKIE_MAX_AGE, len + 100);
 			strlcat(cookie, tsdelta, len + 100);
 		}
 	}
@@ -149,18 +149,18 @@ PHPAPI int php_setcookie(char *name, php_size_t name_len, char *value, php_size_
 	}
 
 	if (path && path_len > 0) {
-		strlcat(cookie, "; path=", len + 100);
+		strlcat(cookie, COOKIE_PATH, len + 100);
 		strlcat(cookie, path, len + 100);
 	}
 	if (domain && domain_len > 0) {
-		strlcat(cookie, "; domain=", len + 100);
+		strlcat(cookie, COOKIE_DOMAIN, len + 100);
 		strlcat(cookie, domain, len + 100);
 	}
 	if (secure) {
-		strlcat(cookie, "; secure", len + 100);
+		strlcat(cookie, COOKIE_SECURE, len + 100);
 	}
 	if (httponly) {
-		strlcat(cookie, "; httponly", len + 100);
+		strlcat(cookie, COOKIE_HTTPONLY, len + 100);
 	}
 
 	ctr.line = cookie;
diff --git a/ext/standard/head.h b/ext/standard/head.h
index 85d6b7d8a5..2aad191008 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -21,6 +21,13 @@
 #ifndef HEAD_H
 #define HEAD_H
 
+#define COOKIE_EXPIRES    "; expires="
+#define COOKIE_MAX_AGE    "; Max-Age="
+#define COOKIE_DOMAIN     "; domain="
+#define COOKIE_PATH       "; path="
+#define COOKIE_SECURE     "; secure"
+#define COOKIE_HTTPONLY   "; HttpOnly"
+
 extern PHP_RINIT_FUNCTION(head);
 PHP_FUNCTION(header);
 PHP_FUNCTION(header_remove);
diff --git a/ext/standard/tests/network/setcookie.phpt b/ext/standard/tests/network/setcookie.phpt
index bf04ec78de..3b8e551834 100644
--- a/ext/standard/tests/network/setcookie.phpt
+++ b/ext/standard/tests/network/setcookie.phpt
@@ -29,13 +29,13 @@ $expected = array(
 	'Set-Cookie: name=value; path=/path/',
 	'Set-Cookie: name=value; domain=domain.tld',
 	'Set-Cookie: name=value; secure',
-	'Set-Cookie: name=value; httponly'
+	'Set-Cookie: name=value; HttpOnly'
 );
 
 $headers = headers_list();
 if (($i = count($expected)) > count($headers))
 {
-	echo "Less headers are being sent than expected - aborting";
+	echo "Fewer headers are being sent than expected - aborting";
 	return;
 }
 
@@ -67,4 +67,4 @@ echo ($i === 0)
 --EXPECTHEADERS--
 
 --EXPECT--
-OK
\ No newline at end of file
+OK
diff --git a/sapi/cli/generate_mime_type_map.php b/sapi/cli/generate_mime_type_map.php
new file mode 100644
index 0000000000..4475004985
--- /dev/null
+++ b/sapi/cli/generate_mime_type_map.php
@@ -0,0 +1,76 @@
+#!/usr/bin/env php
+<?php
+
+// Check if we are being given a mime.types file or if we should use the
+// default URL.
+$source = count($_SERVER['argv']) > 1 ? $_SERVER['argv'][1] : 'https://raw.githubusercontent.com/apache/httpd/trunk/docs/conf/mime.types';
+
+// See if we can actually load it.
+$types = @file($source);
+if ($types === false) {
+	fprintf(STDERR, "Error: unable to read $source\n");
+	exit(1);
+}
+
+// Remove comments and flip into an extensions array.
+$extensions = [];
+array_walk($types, function ($line) use (&$extensions) {
+	$line = trim($line);
+	if ($line && $line[0] != '#') {
+		$fields = preg_split('/\s+/', $line);
+		if (count($fields) > 1) {
+			$mime = array_shift($fields);
+			foreach ($fields as $extension) {
+				$extensions[$extension] = $mime;
+			}
+		}
+	}
+});
+
+?>
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2014 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Moriyoshi Koizumi <moriyoshi@php.net>                        |
+   +----------------------------------------------------------------------+
+*/
+
+/* This is a generated file. Rather than modifying it, please run
+ * "php generate_mime_type_map.php > mime_type_map.h" to regenerate the file. */
+
+#ifndef PHP_CLI_SERVER_MIME_TYPE_MAP_H
+#define PHP_CLI_SERVER_MIME_TYPE_MAP_H
+
+typedef struct php_cli_server_ext_mime_type_pair {
+	const char *ext;
+	const char *mime_type;
+} php_cli_server_ext_mime_type_pair;
+
+static php_cli_server_ext_mime_type_pair mime_type_map[] = {
+<?php foreach ($extensions as $extension => $mime): ?>
+	{ "<?= addcslashes($extension, "\0..\37!@\@\177..\377") ?>", "<?= addcslashes($mime, "\0..\37!@\@\177..\377") ?>" },
+<?php endforeach ?>
+	{ NULL, NULL }
+};
+
+#endif /* PHP_CLI_SERVER_MIME_TYPE_MAP_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/sapi/cli/mime_type_map.h b/sapi/cli/mime_type_map.h
new file mode 100644
index 0000000000..72c05d4149
--- /dev/null
+++ b/sapi/cli/mime_type_map.h
@@ -0,0 +1,1024 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2014 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Moriyoshi Koizumi <moriyoshi@php.net>                        |
+   +----------------------------------------------------------------------+
+*/
+
+/* This is a generated file. Rather than modifying it, please run
+ * "php generate_mime_type_map.php > mime_type_map.h" to regenerate the file. */
+
+#ifndef PHP_CLI_SERVER_MIME_TYPE_MAP_H
+#define PHP_CLI_SERVER_MIME_TYPE_MAP_H
+
+typedef struct php_cli_server_ext_mime_type_pair {
+	const char *ext;
+	const char *mime_type;
+} php_cli_server_ext_mime_type_pair;
+
+static php_cli_server_ext_mime_type_pair mime_type_map[] = {
+	{ "ez", "application/andrew-inset" },
+	{ "aw", "application/applixware" },
+	{ "atom", "application/atom+xml" },
+	{ "atomcat", "application/atomcat+xml" },
+	{ "atomsvc", "application/atomsvc+xml" },
+	{ "ccxml", "application/ccxml+xml" },
+	{ "cdmia", "application/cdmi-capability" },
+	{ "cdmic", "application/cdmi-container" },
+	{ "cdmid", "application/cdmi-domain" },
+	{ "cdmio", "application/cdmi-object" },
+	{ "cdmiq", "application/cdmi-queue" },
+	{ "cu", "application/cu-seeme" },
+	{ "davmount", "application/davmount+xml" },
+	{ "dbk", "application/docbook+xml" },
+	{ "dssc", "application/dssc+der" },
+	{ "xdssc", "application/dssc+xml" },
+	{ "ecma", "application/ecmascript" },
+	{ "emma", "application/emma+xml" },
+	{ "epub", "application/epub+zip" },
+	{ "exi", "application/exi" },
+	{ "pfr", "application/font-tdpfr" },
+	{ "gml", "application/gml+xml" },
+	{ "gpx", "application/gpx+xml" },
+	{ "gxf", "application/gxf" },
+	{ "stk", "application/hyperstudio" },
+	{ "ink", "application/inkml+xml" },
+	{ "inkml", "application/inkml+xml" },
+	{ "ipfix", "application/ipfix" },
+	{ "jar", "application/java-archive" },
+	{ "ser", "application/java-serialized-object" },
+	{ "class", "application/java-vm" },
+	{ "js", "application/javascript" },
+	{ "json", "application/json" },
+	{ "jsonml", "application/jsonml+json" },
+	{ "lostxml", "application/lost+xml" },
+	{ "hqx", "application/mac-binhex40" },
+	{ "cpt", "application/mac-compactpro" },
+	{ "mads", "application/mads+xml" },
+	{ "mrc", "application/marc" },
+	{ "mrcx", "application/marcxml+xml" },
+	{ "ma", "application/mathematica" },
+	{ "nb", "application/mathematica" },
+	{ "mb", "application/mathematica" },
+	{ "mathml", "application/mathml+xml" },
+	{ "mbox", "application/mbox" },
+	{ "mscml", "application/mediaservercontrol+xml" },
+	{ "metalink", "application/metalink+xml" },
+	{ "meta4", "application/metalink4+xml" },
+	{ "mets", "application/mets+xml" },
+	{ "mods", "application/mods+xml" },
+	{ "m21", "application/mp21" },
+	{ "mp21", "application/mp21" },
+	{ "mp4s", "application/mp4" },
+	{ "doc", "application/msword" },
+	{ "dot", "application/msword" },
+	{ "mxf", "application/mxf" },
+	{ "bin", "application/octet-stream" },
+	{ "dms", "application/octet-stream" },
+	{ "lrf", "application/octet-stream" },
+	{ "mar", "application/octet-stream" },
+	{ "so", "application/octet-stream" },
+	{ "dist", "application/octet-stream" },
+	{ "distz", "application/octet-stream" },
+	{ "pkg", "application/octet-stream" },
+	{ "bpk", "application/octet-stream" },
+	{ "dump", "application/octet-stream" },
+	{ "elc", "application/octet-stream" },
+	{ "deploy", "application/octet-stream" },
+	{ "oda", "application/oda" },
+	{ "opf", "application/oebps-package+xml" },
+	{ "ogx", "application/ogg" },
+	{ "omdoc", "application/omdoc+xml" },
+	{ "onetoc", "application/onenote" },
+	{ "onetoc2", "application/onenote" },
+	{ "onetmp", "application/onenote" },
+	{ "onepkg", "application/onenote" },
+	{ "oxps", "application/oxps" },
+	{ "xer", "application/patch-ops-error+xml" },
+	{ "pdf", "application/pdf" },
+	{ "pgp", "application/pgp-encrypted" },
+	{ "asc", "application/pgp-signature" },
+	{ "sig", "application/pgp-signature" },
+	{ "prf", "application/pics-rules" },
+	{ "p10", "application/pkcs10" },
+	{ "p7m", "application/pkcs7-mime" },
+	{ "p7c", "application/pkcs7-mime" },
+	{ "p7s", "application/pkcs7-signature" },
+	{ "p8", "application/pkcs8" },
+	{ "ac", "application/pkix-attr-cert" },
+	{ "cer", "application/pkix-cert" },
+	{ "crl", "application/pkix-crl" },
+	{ "pkipath", "application/pkix-pkipath" },
+	{ "pki", "application/pkixcmp" },
+	{ "pls", "application/pls+xml" },
+	{ "ai", "application/postscript" },
+	{ "eps", "application/postscript" },
+	{ "ps", "application/postscript" },
+	{ "cww", "application/prs.cww" },
+	{ "pskcxml", "application/pskc+xml" },
+	{ "rdf", "application/rdf+xml" },
+	{ "rif", "application/reginfo+xml" },
+	{ "rnc", "application/relax-ng-compact-syntax" },
+	{ "rl", "application/resource-lists+xml" },
+	{ "rld", "application/resource-lists-diff+xml" },
+	{ "rs", "application/rls-services+xml" },
+	{ "gbr", "application/rpki-ghostbusters" },
+	{ "mft", "application/rpki-manifest" },
+	{ "roa", "application/rpki-roa" },
+	{ "rsd", "application/rsd+xml" },
+	{ "rss", "application/rss+xml" },
+	{ "rtf", "application/rtf" },
+	{ "sbml", "application/sbml+xml" },
+	{ "scq", "application/scvp-cv-request" },
+	{ "scs", "application/scvp-cv-response" },
+	{ "spq", "application/scvp-vp-request" },
+	{ "spp", "application/scvp-vp-response" },
+	{ "sdp", "application/sdp" },
+	{ "setpay", "application/set-payment-initiation" },
+	{ "setreg", "application/set-registration-initiation" },
+	{ "shf", "application/shf+xml" },
+	{ "smi", "application/smil+xml" },
+	{ "smil", "application/smil+xml" },
+	{ "rq", "application/sparql-query" },
+	{ "srx", "application/sparql-results+xml" },
+	{ "gram", "application/srgs" },
+	{ "grxml", "application/srgs+xml" },
+	{ "sru", "application/sru+xml" },
+	{ "ssdl", "application/ssdl+xml" },
+	{ "ssml", "application/ssml+xml" },
+	{ "tei", "application/tei+xml" },
+	{ "teicorpus", "application/tei+xml" },
+	{ "tfi", "application/thraud+xml" },
+	{ "tsd", "application/timestamped-data" },
+	{ "plb", "application/vnd.3gpp.pic-bw-large" },
+	{ "psb", "application/vnd.3gpp.pic-bw-small" },
+	{ "pvb", "application/vnd.3gpp.pic-bw-var" },
+	{ "tcap", "application/vnd.3gpp2.tcap" },
+	{ "pwn", "application/vnd.3m.post-it-notes" },
+	{ "aso", "application/vnd.accpac.simply.aso" },
+	{ "imp", "application/vnd.accpac.simply.imp" },
+	{ "acu", "application/vnd.acucobol" },
+	{ "atc", "application/vnd.acucorp" },
+	{ "acutc", "application/vnd.acucorp" },
+	{ "air", "application/vnd.adobe.air-application-installer-package+zip" },
+	{ "fcdt", "application/vnd.adobe.formscentral.fcdt" },
+	{ "fxp", "application/vnd.adobe.fxp" },
+	{ "fxpl", "application/vnd.adobe.fxp" },
+	{ "xdp", "application/vnd.adobe.xdp+xml" },
+	{ "xfdf", "application/vnd.adobe.xfdf" },
+	{ "ahead", "application/vnd.ahead.space" },
+	{ "azf", "application/vnd.airzip.filesecure.azf" },
+	{ "azs", "application/vnd.airzip.filesecure.azs" },
+	{ "azw", "application/vnd.amazon.ebook" },
+	{ "acc", "application/vnd.americandynamics.acc" },
+	{ "ami", "application/vnd.amiga.ami" },
+	{ "apk", "application/vnd.android.package-archive" },
+	{ "cii", "application/vnd.anser-web-certificate-issue-initiation" },
+	{ "fti", "application/vnd.anser-web-funds-transfer-initiation" },
+	{ "atx", "application/vnd.antix.game-component" },
+	{ "mpkg", "application/vnd.apple.installer+xml" },
+	{ "m3u8", "application/vnd.apple.mpegurl" },
+	{ "swi", "application/vnd.aristanetworks.swi" },
+	{ "iota", "application/vnd.astraea-software.iota" },
+	{ "aep", "application/vnd.audiograph" },
+	{ "mpm", "application/vnd.blueice.multipass" },
+	{ "bmi", "application/vnd.bmi" },
+	{ "rep", "application/vnd.businessobjects" },
+	{ "cdxml", "application/vnd.chemdraw+xml" },
+	{ "mmd", "application/vnd.chipnuts.karaoke-mmd" },
+	{ "cdy", "application/vnd.cinderella" },
+	{ "cla", "application/vnd.claymore" },
+	{ "rp9", "application/vnd.cloanto.rp9" },
+	{ "c4g", "application/vnd.clonk.c4group" },
+	{ "c4d", "application/vnd.clonk.c4group" },
+	{ "c4f", "application/vnd.clonk.c4group" },
+	{ "c4p", "application/vnd.clonk.c4group" },
+	{ "c4u", "application/vnd.clonk.c4group" },
+	{ "c11amc", "application/vnd.cluetrust.cartomobile-config" },
+	{ "c11amz", "application/vnd.cluetrust.cartomobile-config-pkg" },
+	{ "csp", "application/vnd.commonspace" },
+	{ "cdbcmsg", "application/vnd.contact.cmsg" },
+	{ "cmc", "application/vnd.cosmocaller" },
+	{ "clkx", "application/vnd.crick.clicker" },
+	{ "clkk", "application/vnd.crick.clicker.keyboard" },
+	{ "clkp", "application/vnd.crick.clicker.palette" },
+	{ "clkt", "application/vnd.crick.clicker.template" },
+	{ "clkw", "application/vnd.crick.clicker.wordbank" },
+	{ "wbs", "application/vnd.criticaltools.wbs+xml" },
+	{ "pml", "application/vnd.ctc-posml" },
+	{ "ppd", "application/vnd.cups-ppd" },
+	{ "car", "application/vnd.curl.car" },
+	{ "pcurl", "application/vnd.curl.pcurl" },
+	{ "dart", "application/vnd.dart" },
+	{ "rdz", "application/vnd.data-vision.rdz" },
+	{ "uvf", "application/vnd.dece.data" },
+	{ "uvvf", "application/vnd.dece.data" },
+	{ "uvd", "application/vnd.dece.data" },
+	{ "uvvd", "application/vnd.dece.data" },
+	{ "uvt", "application/vnd.dece.ttml+xml" },
+	{ "uvvt", "application/vnd.dece.ttml+xml" },
+	{ "uvx", "application/vnd.dece.unspecified" },
+	{ "uvvx", "application/vnd.dece.unspecified" },
+	{ "uvz", "application/vnd.dece.zip" },
+	{ "uvvz", "application/vnd.dece.zip" },
+	{ "fe_launch", "application/vnd.denovo.fcselayout-link" },
+	{ "dna", "application/vnd.dna" },
+	{ "mlp", "application/vnd.dolby.mlp" },
+	{ "dpg", "application/vnd.dpgraph" },
+	{ "dfac", "application/vnd.dreamfactory" },
+	{ "kpxx", "application/vnd.ds-keypoint" },
+	{ "ait", "application/vnd.dvb.ait" },
+	{ "svc", "application/vnd.dvb.service" },
+	{ "geo", "application/vnd.dynageo" },
+	{ "mag", "application/vnd.ecowin.chart" },
+	{ "nml", "application/vnd.enliven" },
+	{ "esf", "application/vnd.epson.esf" },
+	{ "msf", "application/vnd.epson.msf" },
+	{ "qam", "application/vnd.epson.quickanime" },
+	{ "slt", "application/vnd.epson.salt" },
+	{ "ssf", "application/vnd.epson.ssf" },
+	{ "es3", "application/vnd.eszigno3+xml" },
+	{ "et3", "application/vnd.eszigno3+xml" },
+	{ "ez2", "application/vnd.ezpix-album" },
+	{ "ez3", "application/vnd.ezpix-package" },
+	{ "fdf", "application/vnd.fdf" },
+	{ "mseed", "application/vnd.fdsn.mseed" },
+	{ "seed", "application/vnd.fdsn.seed" },
+	{ "dataless", "application/vnd.fdsn.seed" },
+	{ "gph", "application/vnd.flographit" },
+	{ "ftc", "application/vnd.fluxtime.clip" },
+	{ "fm", "application/vnd.framemaker" },
+	{ "frame", "application/vnd.framemaker" },
+	{ "maker", "application/vnd.framemaker" },
+	{ "book", "application/vnd.framemaker" },
+	{ "fnc", "application/vnd.frogans.fnc" },
+	{ "ltf", "application/vnd.frogans.ltf" },
+	{ "fsc", "application/vnd.fsc.weblaunch" },
+	{ "oas", "application/vnd.fujitsu.oasys" },
+	{ "oa2", "application/vnd.fujitsu.oasys2" },
+	{ "oa3", "application/vnd.fujitsu.oasys3" },
+	{ "fg5", "application/vnd.fujitsu.oasysgp" },
+	{ "bh2", "application/vnd.fujitsu.oasysprs" },
+	{ "ddd", "application/vnd.fujixerox.ddd" },
+	{ "xdw", "application/vnd.fujixerox.docuworks" },
+	{ "xbd", "application/vnd.fujixerox.docuworks.binder" },
+	{ "fzs", "application/vnd.fuzzysheet" },
+	{ "txd", "application/vnd.genomatix.tuxedo" },
+	{ "ggb", "application/vnd.geogebra.file" },
+	{ "ggt", "application/vnd.geogebra.tool" },
+	{ "gex", "application/vnd.geometry-explorer" },
+	{ "gre", "application/vnd.geometry-explorer" },
+	{ "gxt", "application/vnd.geonext" },
+	{ "g2w", "application/vnd.geoplan" },
+	{ "g3w", "application/vnd.geospace" },
+	{ "gmx", "application/vnd.gmx" },
+	{ "kml", "application/vnd.google-earth.kml+xml" },
+	{ "kmz", "application/vnd.google-earth.kmz" },
+	{ "gqf", "application/vnd.grafeq" },
+	{ "gqs", "application/vnd.grafeq" },
+	{ "gac", "application/vnd.groove-account" },
+	{ "ghf", "application/vnd.groove-help" },
+	{ "gim", "application/vnd.groove-identity-message" },
+	{ "grv", "application/vnd.groove-injector" },
+	{ "gtm", "application/vnd.groove-tool-message" },
+	{ "tpl", "application/vnd.groove-tool-template" },
+	{ "vcg", "application/vnd.groove-vcard" },
+	{ "hal", "application/vnd.hal+xml" },
+	{ "zmm", "application/vnd.handheld-entertainment+xml" },
+	{ "hbci", "application/vnd.hbci" },
+	{ "les", "application/vnd.hhe.lesson-player" },
+	{ "hpgl", "application/vnd.hp-hpgl" },
+	{ "hpid", "application/vnd.hp-hpid" },
+	{ "hps", "application/vnd.hp-hps" },
+	{ "jlt", "application/vnd.hp-jlyt" },
+	{ "pcl", "application/vnd.hp-pcl" },
+	{ "pclxl", "application/vnd.hp-pclxl" },
+	{ "sfd-hdstx", "application/vnd.hydrostatix.sof-data" },
+	{ "mpy", "application/vnd.ibm.minipay" },
+	{ "afp", "application/vnd.ibm.modcap" },
+	{ "listafp", "application/vnd.ibm.modcap" },
+	{ "list3820", "application/vnd.ibm.modcap" },
+	{ "irm", "application/vnd.ibm.rights-management" },
+	{ "sc", "application/vnd.ibm.secure-container" },
+	{ "icc", "application/vnd.iccprofile" },
+	{ "icm", "application/vnd.iccprofile" },
+	{ "igl", "application/vnd.igloader" },
+	{ "ivp", "application/vnd.immervision-ivp" },
+	{ "ivu", "application/vnd.immervision-ivu" },
+	{ "igm", "application/vnd.insors.igm" },
+	{ "xpw", "application/vnd.intercon.formnet" },
+	{ "xpx", "application/vnd.intercon.formnet" },
+	{ "i2g", "application/vnd.intergeo" },
+	{ "qbo", "application/vnd.intu.qbo" },
+	{ "qfx", "application/vnd.intu.qfx" },
+	{ "rcprofile", "application/vnd.ipunplugged.rcprofile" },
+	{ "irp", "application/vnd.irepository.package+xml" },
+	{ "xpr", "application/vnd.is-xpr" },
+	{ "fcs", "application/vnd.isac.fcs" },
+	{ "jam", "application/vnd.jam" },
+	{ "rms", "application/vnd.jcp.javame.midlet-rms" },
+	{ "jisp", "application/vnd.jisp" },
+	{ "joda", "application/vnd.joost.joda-archive" },
+	{ "ktz", "application/vnd.kahootz" },
+	{ "ktr", "application/vnd.kahootz" },
+	{ "karbon", "application/vnd.kde.karbon" },
+	{ "chrt", "application/vnd.kde.kchart" },
+	{ "kfo", "application/vnd.kde.kformula" },
+	{ "flw", "application/vnd.kde.kivio" },
+	{ "kon", "application/vnd.kde.kontour" },
+	{ "kpr", "application/vnd.kde.kpresenter" },
+	{ "kpt", "application/vnd.kde.kpresenter" },
+	{ "ksp", "application/vnd.kde.kspread" },
+	{ "kwd", "application/vnd.kde.kword" },
+	{ "kwt", "application/vnd.kde.kword" },
+	{ "htke", "application/vnd.kenameaapp" },
+	{ "kia", "application/vnd.kidspiration" },
+	{ "kne", "application/vnd.kinar" },
+	{ "knp", "application/vnd.kinar" },
+	{ "skp", "application/vnd.koan" },
+	{ "skd", "application/vnd.koan" },
+	{ "skt", "application/vnd.koan" },
+	{ "skm", "application/vnd.koan" },
+	{ "sse", "application/vnd.kodak-descriptor" },
+	{ "lasxml", "application/vnd.las.las+xml" },
+	{ "lbd", "application/vnd.llamagraphics.life-balance.desktop" },
+	{ "lbe", "application/vnd.llamagraphics.life-balance.exchange+xml" },
+	{ "123", "application/vnd.lotus-1-2-3" },
+	{ "apr", "application/vnd.lotus-approach" },
+	{ "pre", "application/vnd.lotus-freelance" },
+	{ "nsf", "application/vnd.lotus-notes" },
+	{ "org", "application/vnd.lotus-organizer" },
+	{ "scm", "application/vnd.lotus-screencam" },
+	{ "lwp", "application/vnd.lotus-wordpro" },
+	{ "portpkg", "application/vnd.macports.portpkg" },
+	{ "mcd", "application/vnd.mcd" },
+	{ "mc1", "application/vnd.medcalcdata" },
+	{ "cdkey", "application/vnd.mediastation.cdkey" },
+	{ "mwf", "application/vnd.mfer" },
+	{ "mfm", "application/vnd.mfmp" },
+	{ "flo", "application/vnd.micrografx.flo" },
+	{ "igx", "application/vnd.micrografx.igx" },
+	{ "mif", "application/vnd.mif" },
+	{ "daf", "application/vnd.mobius.daf" },
+	{ "dis", "application/vnd.mobius.dis" },
+	{ "mbk", "application/vnd.mobius.mbk" },
+	{ "mqy", "application/vnd.mobius.mqy" },
+	{ "msl", "application/vnd.mobius.msl" },
+	{ "plc", "application/vnd.mobius.plc" },
+	{ "txf", "application/vnd.mobius.txf" },
+	{ "mpn", "application/vnd.mophun.application" },
+	{ "mpc", "application/vnd.mophun.certificate" },
+	{ "xul", "application/vnd.mozilla.xul+xml" },
+	{ "cil", "application/vnd.ms-artgalry" },
+	{ "cab", "application/vnd.ms-cab-compressed" },
+	{ "xls", "application/vnd.ms-excel" },
+	{ "xlm", "application/vnd.ms-excel" },
+	{ "xla", "application/vnd.ms-excel" },
+	{ "xlc", "application/vnd.ms-excel" },
+	{ "xlt", "application/vnd.ms-excel" },
+	{ "xlw", "application/vnd.ms-excel" },
+	{ "xlam", "application/vnd.ms-excel.addin.macroenabled.12" },
+	{ "xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12" },
+	{ "xlsm", "application/vnd.ms-excel.sheet.macroenabled.12" },
+	{ "xltm", "application/vnd.ms-excel.template.macroenabled.12" },
+	{ "eot", "application/vnd.ms-fontobject" },
+	{ "chm", "application/vnd.ms-htmlhelp" },
+	{ "ims", "application/vnd.ms-ims" },
+	{ "lrm", "application/vnd.ms-lrm" },
+	{ "thmx", "application/vnd.ms-officetheme" },
+	{ "cat", "application/vnd.ms-pki.seccat" },
+	{ "stl", "application/vnd.ms-pki.stl" },
+	{ "ppt", "application/vnd.ms-powerpoint" },
+	{ "pps", "application/vnd.ms-powerpoint" },
+	{ "pot", "application/vnd.ms-powerpoint" },
+	{ "ppam", "application/vnd.ms-powerpoint.addin.macroenabled.12" },
+	{ "pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12" },
+	{ "sldm", "application/vnd.ms-powerpoint.slide.macroenabled.12" },
+	{ "ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12" },
+	{ "potm", "application/vnd.ms-powerpoint.template.macroenabled.12" },
+	{ "mpp", "application/vnd.ms-project" },
+	{ "mpt", "application/vnd.ms-project" },
+	{ "docm", "application/vnd.ms-word.document.macroenabled.12" },
+	{ "dotm", "application/vnd.ms-word.template.macroenabled.12" },
+	{ "wps", "application/vnd.ms-works" },
+	{ "wks", "application/vnd.ms-works" },
+	{ "wcm", "application/vnd.ms-works" },
+	{ "wdb", "application/vnd.ms-works" },
+	{ "wpl", "application/vnd.ms-wpl" },
+	{ "xps", "application/vnd.ms-xpsdocument" },
+	{ "mseq", "application/vnd.mseq" },
+	{ "mus", "application/vnd.musician" },
+	{ "msty", "application/vnd.muvee.style" },
+	{ "taglet", "application/vnd.mynfc" },
+	{ "nlu", "application/vnd.neurolanguage.nlu" },
+	{ "ntf", "application/vnd.nitf" },
+	{ "nitf", "application/vnd.nitf" },
+	{ "nnd", "application/vnd.noblenet-directory" },
+	{ "nns", "application/vnd.noblenet-sealer" },
+	{ "nnw", "application/vnd.noblenet-web" },
+	{ "ngdat", "application/vnd.nokia.n-gage.data" },
+	{ "n-gage", "application/vnd.nokia.n-gage.symbian.install" },
+	{ "rpst", "application/vnd.nokia.radio-preset" },
+	{ "rpss", "application/vnd.nokia.radio-presets" },
+	{ "edm", "application/vnd.novadigm.edm" },
+	{ "edx", "application/vnd.novadigm.edx" },
+	{ "ext", "application/vnd.novadigm.ext" },
+	{ "odc", "application/vnd.oasis.opendocument.chart" },
+	{ "otc", "application/vnd.oasis.opendocument.chart-template" },
+	{ "odb", "application/vnd.oasis.opendocument.database" },
+	{ "odf", "application/vnd.oasis.opendocument.formula" },
+	{ "odft", "application/vnd.oasis.opendocument.formula-template" },
+	{ "odg", "application/vnd.oasis.opendocument.graphics" },
+	{ "otg", "application/vnd.oasis.opendocument.graphics-template" },
+	{ "odi", "application/vnd.oasis.opendocument.image" },
+	{ "oti", "application/vnd.oasis.opendocument.image-template" },
+	{ "odp", "application/vnd.oasis.opendocument.presentation" },
+	{ "otp", "application/vnd.oasis.opendocument.presentation-template" },
+	{ "ods", "application/vnd.oasis.opendocument.spreadsheet" },
+	{ "ots", "application/vnd.oasis.opendocument.spreadsheet-template" },
+	{ "odt", "application/vnd.oasis.opendocument.text" },
+	{ "odm", "application/vnd.oasis.opendocument.text-master" },
+	{ "ott", "application/vnd.oasis.opendocument.text-template" },
+	{ "oth", "application/vnd.oasis.opendocument.text-web" },
+	{ "xo", "application/vnd.olpc-sugar" },
+	{ "dd2", "application/vnd.oma.dd2+xml" },
+	{ "oxt", "application/vnd.openofficeorg.extension" },
+	{ "pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" },
+	{ "sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" },
+	{ "ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" },
+	{ "potx", "application/vnd.openxmlformats-officedocument.presentationml.template" },
+	{ "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" },
+	{ "xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
+	{ "docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" },
+	{ "dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" },
+	{ "mgp", "application/vnd.osgeo.mapguide.package" },
+	{ "dp", "application/vnd.osgi.dp" },
+	{ "esa", "application/vnd.osgi.subsystem" },
+	{ "pdb", "application/vnd.palm" },
+	{ "pqa", "application/vnd.palm" },
+	{ "oprc", "application/vnd.palm" },
+	{ "paw", "application/vnd.pawaafile" },
+	{ "str", "application/vnd.pg.format" },
+	{ "ei6", "application/vnd.pg.osasli" },
+	{ "efif", "application/vnd.picsel" },
+	{ "wg", "application/vnd.pmi.widget" },
+	{ "plf", "application/vnd.pocketlearn" },
+	{ "pbd", "application/vnd.powerbuilder6" },
+	{ "box", "application/vnd.previewsystems.box" },
+	{ "mgz", "application/vnd.proteus.magazine" },
+	{ "qps", "application/vnd.publishare-delta-tree" },
+	{ "ptid", "application/vnd.pvi.ptid1" },
+	{ "qxd", "application/vnd.quark.quarkxpress" },
+	{ "qxt", "application/vnd.quark.quarkxpress" },
+	{ "qwd", "application/vnd.quark.quarkxpress" },
+	{ "qwt", "application/vnd.quark.quarkxpress" },
+	{ "qxl", "application/vnd.quark.quarkxpress" },
+	{ "qxb", "application/vnd.quark.quarkxpress" },
+	{ "bed", "application/vnd.realvnc.bed" },
+	{ "mxl", "application/vnd.recordare.musicxml" },
+	{ "musicxml", "application/vnd.recordare.musicxml+xml" },
+	{ "cryptonote", "application/vnd.rig.cryptonote" },
+	{ "cod", "application/vnd.rim.cod" },
+	{ "rm", "application/vnd.rn-realmedia" },
+	{ "rmvb", "application/vnd.rn-realmedia-vbr" },
+	{ "link66", "application/vnd.route66.link66+xml" },
+	{ "st", "application/vnd.sailingtracker.track" },
+	{ "see", "application/vnd.seemail" },
+	{ "sema", "application/vnd.sema" },
+	{ "semd", "application/vnd.semd" },
+	{ "semf", "application/vnd.semf" },
+	{ "ifm", "application/vnd.shana.informed.formdata" },
+	{ "itp", "application/vnd.shana.informed.formtemplate" },
+	{ "iif", "application/vnd.shana.informed.interchange" },
+	{ "ipk", "application/vnd.shana.informed.package" },
+	{ "twd", "application/vnd.simtech-mindmapper" },
+	{ "twds", "application/vnd.simtech-mindmapper" },
+	{ "mmf", "application/vnd.smaf" },
+	{ "teacher", "application/vnd.smart.teacher" },
+	{ "sdkm", "application/vnd.solent.sdkm+xml" },
+	{ "sdkd", "application/vnd.solent.sdkm+xml" },
+	{ "dxp", "application/vnd.spotfire.dxp" },
+	{ "sfs", "application/vnd.spotfire.sfs" },
+	{ "sdc", "application/vnd.stardivision.calc" },
+	{ "sda", "application/vnd.stardivision.draw" },
+	{ "sdd", "application/vnd.stardivision.impress" },
+	{ "smf", "application/vnd.stardivision.math" },
+	{ "sdw", "application/vnd.stardivision.writer" },
+	{ "vor", "application/vnd.stardivision.writer" },
+	{ "sgl", "application/vnd.stardivision.writer-global" },
+	{ "smzip", "application/vnd.stepmania.package" },
+	{ "sm", "application/vnd.stepmania.stepchart" },
+	{ "sxc", "application/vnd.sun.xml.calc" },
+	{ "stc", "application/vnd.sun.xml.calc.template" },
+	{ "sxd", "application/vnd.sun.xml.draw" },
+	{ "std", "application/vnd.sun.xml.draw.template" },
+	{ "sxi", "application/vnd.sun.xml.impress" },
+	{ "sti", "application/vnd.sun.xml.impress.template" },
+	{ "sxm", "application/vnd.sun.xml.math" },
+	{ "sxw", "application/vnd.sun.xml.writer" },
+	{ "sxg", "application/vnd.sun.xml.writer.global" },
+	{ "stw", "application/vnd.sun.xml.writer.template" },
+	{ "sus", "application/vnd.sus-calendar" },
+	{ "susp", "application/vnd.sus-calendar" },
+	{ "svd", "application/vnd.svd" },
+	{ "sis", "application/vnd.symbian.install" },
+	{ "sisx", "application/vnd.symbian.install" },
+	{ "xsm", "application/vnd.syncml+xml" },
+	{ "bdm", "application/vnd.syncml.dm+wbxml" },
+	{ "xdm", "application/vnd.syncml.dm+xml" },
+	{ "tao", "application/vnd.tao.intent-module-archive" },
+	{ "pcap", "application/vnd.tcpdump.pcap" },
+	{ "cap", "application/vnd.tcpdump.pcap" },
+	{ "dmp", "application/vnd.tcpdump.pcap" },
+	{ "tmo", "application/vnd.tmobile-livetv" },
+	{ "tpt", "application/vnd.trid.tpt" },
+	{ "mxs", "application/vnd.triscape.mxs" },
+	{ "tra", "application/vnd.trueapp" },
+	{ "ufd", "application/vnd.ufdl" },
+	{ "ufdl", "application/vnd.ufdl" },
+	{ "utz", "application/vnd.uiq.theme" },
+	{ "umj", "application/vnd.umajin" },
+	{ "unityweb", "application/vnd.unity" },
+	{ "uoml", "application/vnd.uoml+xml" },
+	{ "vcx", "application/vnd.vcx" },
+	{ "vsd", "application/vnd.visio" },
+	{ "vst", "application/vnd.visio" },
+	{ "vss", "application/vnd.visio" },
+	{ "vsw", "application/vnd.visio" },
+	{ "vis", "application/vnd.visionary" },
+	{ "vsf", "application/vnd.vsf" },
+	{ "wbxml", "application/vnd.wap.wbxml" },
+	{ "wmlc", "application/vnd.wap.wmlc" },
+	{ "wmlsc", "application/vnd.wap.wmlscriptc" },
+	{ "wtb", "application/vnd.webturbo" },
+	{ "nbp", "application/vnd.wolfram.player" },
+	{ "wpd", "application/vnd.wordperfect" },
+	{ "wqd", "application/vnd.wqd" },
+	{ "stf", "application/vnd.wt.stf" },
+	{ "xar", "application/vnd.xara" },
+	{ "xfdl", "application/vnd.xfdl" },
+	{ "hvd", "application/vnd.yamaha.hv-dic" },
+	{ "hvs", "application/vnd.yamaha.hv-script" },
+	{ "hvp", "application/vnd.yamaha.hv-voice" },
+	{ "osf", "application/vnd.yamaha.openscoreformat" },
+	{ "osfpvg", "application/vnd.yamaha.openscoreformat.osfpvg+xml" },
+	{ "saf", "application/vnd.yamaha.smaf-audio" },
+	{ "spf", "application/vnd.yamaha.smaf-phrase" },
+	{ "cmp", "application/vnd.yellowriver-custom-menu" },
+	{ "zir", "application/vnd.zul" },
+	{ "zirz", "application/vnd.zul" },
+	{ "zaz", "application/vnd.zzazz.deck+xml" },
+	{ "vxml", "application/voicexml+xml" },
+	{ "wgt", "application/widget" },
+	{ "hlp", "application/winhlp" },
+	{ "wsdl", "application/wsdl+xml" },
+	{ "wspolicy", "application/wspolicy+xml" },
+	{ "7z", "application/x-7z-compressed" },
+	{ "abw", "application/x-abiword" },
+	{ "ace", "application/x-ace-compressed" },
+	{ "dmg", "application/x-apple-diskimage" },
+	{ "aab", "application/x-authorware-bin" },
+	{ "x32", "application/x-authorware-bin" },
+	{ "u32", "application/x-authorware-bin" },
+	{ "vox", "application/x-authorware-bin" },
+	{ "aam", "application/x-authorware-map" },
+	{ "aas", "application/x-authorware-seg" },
+	{ "bcpio", "application/x-bcpio" },
+	{ "torrent", "application/x-bittorrent" },
+	{ "blb", "application/x-blorb" },
+	{ "blorb", "application/x-blorb" },
+	{ "bz", "application/x-bzip" },
+	{ "bz2", "application/x-bzip2" },
+	{ "boz", "application/x-bzip2" },
+	{ "cbr", "application/x-cbr" },
+	{ "cba", "application/x-cbr" },
+	{ "cbt", "application/x-cbr" },
+	{ "cbz", "application/x-cbr" },
+	{ "cb7", "application/x-cbr" },
+	{ "vcd", "application/x-cdlink" },
+	{ "cfs", "application/x-cfs-compressed" },
+	{ "chat", "application/x-chat" },
+	{ "pgn", "application/x-chess-pgn" },
+	{ "nsc", "application/x-conference" },
+	{ "cpio", "application/x-cpio" },
+	{ "csh", "application/x-csh" },
+	{ "deb", "application/x-debian-package" },
+	{ "udeb", "application/x-debian-package" },
+	{ "dgc", "application/x-dgc-compressed" },
+	{ "dir", "application/x-director" },
+	{ "dcr", "application/x-director" },
+	{ "dxr", "application/x-director" },
+	{ "cst", "application/x-director" },
+	{ "cct", "application/x-director" },
+	{ "cxt", "application/x-director" },
+	{ "w3d", "application/x-director" },
+	{ "fgd", "application/x-director" },
+	{ "swa", "application/x-director" },
+	{ "wad", "application/x-doom" },
+	{ "ncx", "application/x-dtbncx+xml" },
+	{ "dtb", "application/x-dtbook+xml" },
+	{ "res", "application/x-dtbresource+xml" },
+	{ "dvi", "application/x-dvi" },
+	{ "evy", "application/x-envoy" },
+	{ "eva", "application/x-eva" },
+	{ "bdf", "application/x-font-bdf" },
+	{ "gsf", "application/x-font-ghostscript" },
+	{ "psf", "application/x-font-linux-psf" },
+	{ "otf", "application/x-font-otf" },
+	{ "pcf", "application/x-font-pcf" },
+	{ "snf", "application/x-font-snf" },
+	{ "ttf", "application/x-font-ttf" },
+	{ "ttc", "application/x-font-ttf" },
+	{ "pfa", "application/x-font-type1" },
+	{ "pfb", "application/x-font-type1" },
+	{ "pfm", "application/x-font-type1" },
+	{ "afm", "application/x-font-type1" },
+	{ "woff", "application/font-woff" },
+	{ "arc", "application/x-freearc" },
+	{ "spl", "application/x-futuresplash" },
+	{ "gca", "application/x-gca-compressed" },
+	{ "ulx", "application/x-glulx" },
+	{ "gnumeric", "application/x-gnumeric" },
+	{ "gramps", "application/x-gramps-xml" },
+	{ "gtar", "application/x-gtar" },
+	{ "hdf", "application/x-hdf" },
+	{ "install", "application/x-install-instructions" },
+	{ "iso", "application/x-iso9660-image" },
+	{ "jnlp", "application/x-java-jnlp-file" },
+	{ "latex", "application/x-latex" },
+	{ "lzh", "application/x-lzh-compressed" },
+	{ "lha", "application/x-lzh-compressed" },
+	{ "mie", "application/x-mie" },
+	{ "prc", "application/x-mobipocket-ebook" },
+	{ "mobi", "application/x-mobipocket-ebook" },
+	{ "application", "application/x-ms-application" },
+	{ "lnk", "application/x-ms-shortcut" },
+	{ "wmd", "application/x-ms-wmd" },
+	{ "wmz", "application/x-msmetafile" },
+	{ "xbap", "application/x-ms-xbap" },
+	{ "mdb", "application/x-msaccess" },
+	{ "obd", "application/x-msbinder" },
+	{ "crd", "application/x-mscardfile" },
+	{ "clp", "application/x-msclip" },
+	{ "exe", "application/x-msdownload" },
+	{ "dll", "application/x-msdownload" },
+	{ "com", "application/x-msdownload" },
+	{ "bat", "application/x-msdownload" },
+	{ "msi", "application/x-msdownload" },
+	{ "mvb", "application/x-msmediaview" },
+	{ "m13", "application/x-msmediaview" },
+	{ "m14", "application/x-msmediaview" },
+	{ "wmf", "application/x-msmetafile" },
+	{ "emf", "application/x-msmetafile" },
+	{ "emz", "application/x-msmetafile" },
+	{ "mny", "application/x-msmoney" },
+	{ "pub", "application/x-mspublisher" },
+	{ "scd", "application/x-msschedule" },
+	{ "trm", "application/x-msterminal" },
+	{ "wri", "application/x-mswrite" },
+	{ "nc", "application/x-netcdf" },
+	{ "cdf", "application/x-netcdf" },
+	{ "nzb", "application/x-nzb" },
+	{ "p12", "application/x-pkcs12" },
+	{ "pfx", "application/x-pkcs12" },
+	{ "p7b", "application/x-pkcs7-certificates" },
+	{ "spc", "application/x-pkcs7-certificates" },
+	{ "p7r", "application/x-pkcs7-certreqresp" },
+	{ "rar", "application/x-rar-compressed" },
+	{ "ris", "application/x-research-info-systems" },
+	{ "sh", "application/x-sh" },
+	{ "shar", "application/x-shar" },
+	{ "swf", "application/x-shockwave-flash" },
+	{ "xap", "application/x-silverlight-app" },
+	{ "sql", "application/x-sql" },
+	{ "sit", "application/x-stuffit" },
+	{ "sitx", "application/x-stuffitx" },
+	{ "srt", "application/x-subrip" },
+	{ "sv4cpio", "application/x-sv4cpio" },
+	{ "sv4crc", "application/x-sv4crc" },
+	{ "t3", "application/x-t3vm-image" },
+	{ "gam", "application/x-tads" },
+	{ "tar", "application/x-tar" },
+	{ "tcl", "application/x-tcl" },
+	{ "tex", "application/x-tex" },
+	{ "tfm", "application/x-tex-tfm" },
+	{ "texinfo", "application/x-texinfo" },
+	{ "texi", "application/x-texinfo" },
+	{ "obj", "application/x-tgif" },
+	{ "ustar", "application/x-ustar" },
+	{ "src", "application/x-wais-source" },
+	{ "der", "application/x-x509-ca-cert" },
+	{ "crt", "application/x-x509-ca-cert" },
+	{ "fig", "application/x-xfig" },
+	{ "xlf", "application/x-xliff+xml" },
+	{ "xpi", "application/x-xpinstall" },
+	{ "xz", "application/x-xz" },
+	{ "z1", "application/x-zmachine" },
+	{ "z2", "application/x-zmachine" },
+	{ "z3", "application/x-zmachine" },
+	{ "z4", "application/x-zmachine" },
+	{ "z5", "application/x-zmachine" },
+	{ "z6", "application/x-zmachine" },
+	{ "z7", "application/x-zmachine" },
+	{ "z8", "application/x-zmachine" },
+	{ "xaml", "application/xaml+xml" },
+	{ "xdf", "application/xcap-diff+xml" },
+	{ "xenc", "application/xenc+xml" },
+	{ "xhtml", "application/xhtml+xml" },
+	{ "xht", "application/xhtml+xml" },
+	{ "xml", "application/xml" },
+	{ "xsl", "application/xml" },
+	{ "dtd", "application/xml-dtd" },
+	{ "xop", "application/xop+xml" },
+	{ "xpl", "application/xproc+xml" },
+	{ "xslt", "application/xslt+xml" },
+	{ "xspf", "application/xspf+xml" },
+	{ "mxml", "application/xv+xml" },
+	{ "xhvml", "application/xv+xml" },
+	{ "xvml", "application/xv+xml" },
+	{ "xvm", "application/xv+xml" },
+	{ "yang", "application/yang" },
+	{ "yin", "application/yin+xml" },
+	{ "zip", "application/zip" },
+	{ "adp", "audio/adpcm" },
+	{ "au", "audio/basic" },
+	{ "snd", "audio/basic" },
+	{ "mid", "audio/midi" },
+	{ "midi", "audio/midi" },
+	{ "kar", "audio/midi" },
+	{ "rmi", "audio/midi" },
+	{ "mp4a", "audio/mp4" },
+	{ "mpga", "audio/mpeg" },
+	{ "mp2", "audio/mpeg" },
+	{ "mp2a", "audio/mpeg" },
+	{ "mp3", "audio/mpeg" },
+	{ "m2a", "audio/mpeg" },
+	{ "m3a", "audio/mpeg" },
+	{ "oga", "audio/ogg" },
+	{ "ogg", "audio/ogg" },
+	{ "spx", "audio/ogg" },
+	{ "s3m", "audio/s3m" },
+	{ "sil", "audio/silk" },
+	{ "uva", "audio/vnd.dece.audio" },
+	{ "uvva", "audio/vnd.dece.audio" },
+	{ "eol", "audio/vnd.digital-winds" },
+	{ "dra", "audio/vnd.dra" },
+	{ "dts", "audio/vnd.dts" },
+	{ "dtshd", "audio/vnd.dts.hd" },
+	{ "lvp", "audio/vnd.lucent.voice" },
+	{ "pya", "audio/vnd.ms-playready.media.pya" },
+	{ "ecelp4800", "audio/vnd.nuera.ecelp4800" },
+	{ "ecelp7470", "audio/vnd.nuera.ecelp7470" },
+	{ "ecelp9600", "audio/vnd.nuera.ecelp9600" },
+	{ "rip", "audio/vnd.rip" },
+	{ "weba", "audio/webm" },
+	{ "aac", "audio/x-aac" },
+	{ "aif", "audio/x-aiff" },
+	{ "aiff", "audio/x-aiff" },
+	{ "aifc", "audio/x-aiff" },
+	{ "caf", "audio/x-caf" },
+	{ "flac", "audio/x-flac" },
+	{ "mka", "audio/x-matroska" },
+	{ "m3u", "audio/x-mpegurl" },
+	{ "wax", "audio/x-ms-wax" },
+	{ "wma", "audio/x-ms-wma" },
+	{ "ram", "audio/x-pn-realaudio" },
+	{ "ra", "audio/x-pn-realaudio" },
+	{ "rmp", "audio/x-pn-realaudio-plugin" },
+	{ "wav", "audio/x-wav" },
+	{ "xm", "audio/xm" },
+	{ "cdx", "chemical/x-cdx" },
+	{ "cif", "chemical/x-cif" },
+	{ "cmdf", "chemical/x-cmdf" },
+	{ "cml", "chemical/x-cml" },
+	{ "csml", "chemical/x-csml" },
+	{ "xyz", "chemical/x-xyz" },
+	{ "bmp", "image/bmp" },
+	{ "cgm", "image/cgm" },
+	{ "g3", "image/g3fax" },
+	{ "gif", "image/gif" },
+	{ "ief", "image/ief" },
+	{ "jpeg", "image/jpeg" },
+	{ "jpg", "image/jpeg" },
+	{ "jpe", "image/jpeg" },
+	{ "ktx", "image/ktx" },
+	{ "png", "image/png" },
+	{ "btif", "image/prs.btif" },
+	{ "sgi", "image/sgi" },
+	{ "svg", "image/svg+xml" },
+	{ "svgz", "image/svg+xml" },
+	{ "tiff", "image/tiff" },
+	{ "tif", "image/tiff" },
+	{ "psd", "image/vnd.adobe.photoshop" },
+	{ "uvi", "image/vnd.dece.graphic" },
+	{ "uvvi", "image/vnd.dece.graphic" },
+	{ "uvg", "image/vnd.dece.graphic" },
+	{ "uvvg", "image/vnd.dece.graphic" },
+	{ "sub", "text/vnd.dvb.subtitle" },
+	{ "djvu", "image/vnd.djvu" },
+	{ "djv", "image/vnd.djvu" },
+	{ "dwg", "image/vnd.dwg" },
+	{ "dxf", "image/vnd.dxf" },
+	{ "fbs", "image/vnd.fastbidsheet" },
+	{ "fpx", "image/vnd.fpx" },
+	{ "fst", "image/vnd.fst" },
+	{ "mmr", "image/vnd.fujixerox.edmics-mmr" },
+	{ "rlc", "image/vnd.fujixerox.edmics-rlc" },
+	{ "mdi", "image/vnd.ms-modi" },
+	{ "wdp", "image/vnd.ms-photo" },
+	{ "npx", "image/vnd.net-fpx" },
+	{ "wbmp", "image/vnd.wap.wbmp" },
+	{ "xif", "image/vnd.xiff" },
+	{ "webp", "image/webp" },
+	{ "3ds", "image/x-3ds" },
+	{ "ras", "image/x-cmu-raster" },
+	{ "cmx", "image/x-cmx" },
+	{ "fh", "image/x-freehand" },
+	{ "fhc", "image/x-freehand" },
+	{ "fh4", "image/x-freehand" },
+	{ "fh5", "image/x-freehand" },
+	{ "fh7", "image/x-freehand" },
+	{ "ico", "image/x-icon" },
+	{ "sid", "image/x-mrsid-image" },
+	{ "pcx", "image/x-pcx" },
+	{ "pic", "image/x-pict" },
+	{ "pct", "image/x-pict" },
+	{ "pnm", "image/x-portable-anymap" },
+	{ "pbm", "image/x-portable-bitmap" },
+	{ "pgm", "image/x-portable-graymap" },
+	{ "ppm", "image/x-portable-pixmap" },
+	{ "rgb", "image/x-rgb" },
+	{ "tga", "image/x-tga" },
+	{ "xbm", "image/x-xbitmap" },
+	{ "xpm", "image/x-xpixmap" },
+	{ "xwd", "image/x-xwindowdump" },
+	{ "eml", "message/rfc822" },
+	{ "mime", "message/rfc822" },
+	{ "igs", "model/iges" },
+	{ "iges", "model/iges" },
+	{ "msh", "model/mesh" },
+	{ "mesh", "model/mesh" },
+	{ "silo", "model/mesh" },
+	{ "dae", "model/vnd.collada+xml" },
+	{ "dwf", "model/vnd.dwf" },
+	{ "gdl", "model/vnd.gdl" },
+	{ "gtw", "model/vnd.gtw" },
+	{ "mts", "model/vnd.mts" },
+	{ "vtu", "model/vnd.vtu" },
+	{ "wrl", "model/vrml" },
+	{ "vrml", "model/vrml" },
+	{ "x3db", "model/x3d+binary" },
+	{ "x3dbz", "model/x3d+binary" },
+	{ "x3dv", "model/x3d+vrml" },
+	{ "x3dvz", "model/x3d+vrml" },
+	{ "x3d", "model/x3d+xml" },
+	{ "x3dz", "model/x3d+xml" },
+	{ "appcache", "text/cache-manifest" },
+	{ "ics", "text/calendar" },
+	{ "ifb", "text/calendar" },
+	{ "css", "text/css" },
+	{ "csv", "text/csv" },
+	{ "html", "text/html" },
+	{ "htm", "text/html" },
+	{ "n3", "text/n3" },
+	{ "txt", "text/plain" },
+	{ "text", "text/plain" },
+	{ "conf", "text/plain" },
+	{ "def", "text/plain" },
+	{ "list", "text/plain" },
+	{ "log", "text/plain" },
+	{ "in", "text/plain" },
+	{ "dsc", "text/prs.lines.tag" },
+	{ "rtx", "text/richtext" },
+	{ "sgml", "text/sgml" },
+	{ "sgm", "text/sgml" },
+	{ "tsv", "text/tab-separated-values" },
+	{ "t", "text/troff" },
+	{ "tr", "text/troff" },
+	{ "roff", "text/troff" },
+	{ "man", "text/troff" },
+	{ "me", "text/troff" },
+	{ "ms", "text/troff" },
+	{ "ttl", "text/turtle" },
+	{ "uri", "text/uri-list" },
+	{ "uris", "text/uri-list" },
+	{ "urls", "text/uri-list" },
+	{ "vcard", "text/vcard" },
+	{ "curl", "text/vnd.curl" },
+	{ "dcurl", "text/vnd.curl.dcurl" },
+	{ "scurl", "text/vnd.curl.scurl" },
+	{ "mcurl", "text/vnd.curl.mcurl" },
+	{ "fly", "text/vnd.fly" },
+	{ "flx", "text/vnd.fmi.flexstor" },
+	{ "gv", "text/vnd.graphviz" },
+	{ "3dml", "text/vnd.in3d.3dml" },
+	{ "spot", "text/vnd.in3d.spot" },
+	{ "jad", "text/vnd.sun.j2me.app-descriptor" },
+	{ "wml", "text/vnd.wap.wml" },
+	{ "wmls", "text/vnd.wap.wmlscript" },
+	{ "s", "text/x-asm" },
+	{ "asm", "text/x-asm" },
+	{ "c", "text/x-c" },
+	{ "cc", "text/x-c" },
+	{ "cxx", "text/x-c" },
+	{ "cpp", "text/x-c" },
+	{ "h", "text/x-c" },
+	{ "hh", "text/x-c" },
+	{ "dic", "text/x-c" },
+	{ "f", "text/x-fortran" },
+	{ "for", "text/x-fortran" },
+	{ "f77", "text/x-fortran" },
+	{ "f90", "text/x-fortran" },
+	{ "java", "text/x-java-source" },
+	{ "opml", "text/x-opml" },
+	{ "p", "text/x-pascal" },
+	{ "pas", "text/x-pascal" },
+	{ "nfo", "text/x-nfo" },
+	{ "etx", "text/x-setext" },
+	{ "sfv", "text/x-sfv" },
+	{ "uu", "text/x-uuencode" },
+	{ "vcs", "text/x-vcalendar" },
+	{ "vcf", "text/x-vcard" },
+	{ "3gp", "video/3gpp" },
+	{ "3g2", "video/3gpp2" },
+	{ "h261", "video/h261" },
+	{ "h263", "video/h263" },
+	{ "h264", "video/h264" },
+	{ "jpgv", "video/jpeg" },
+	{ "jpm", "video/jpm" },
+	{ "jpgm", "video/jpm" },
+	{ "mj2", "video/mj2" },
+	{ "mjp2", "video/mj2" },
+	{ "mp4", "video/mp4" },
+	{ "mp4v", "video/mp4" },
+	{ "mpg4", "video/mp4" },
+	{ "mpeg", "video/mpeg" },
+	{ "mpg", "video/mpeg" },
+	{ "mpe", "video/mpeg" },
+	{ "m1v", "video/mpeg" },
+	{ "m2v", "video/mpeg" },
+	{ "ogv", "video/ogg" },
+	{ "qt", "video/quicktime" },
+	{ "mov", "video/quicktime" },
+	{ "uvh", "video/vnd.dece.hd" },
+	{ "uvvh", "video/vnd.dece.hd" },
+	{ "uvm", "video/vnd.dece.mobile" },
+	{ "uvvm", "video/vnd.dece.mobile" },
+	{ "uvp", "video/vnd.dece.pd" },
+	{ "uvvp", "video/vnd.dece.pd" },
+	{ "uvs", "video/vnd.dece.sd" },
+	{ "uvvs", "video/vnd.dece.sd" },
+	{ "uvv", "video/vnd.dece.video" },
+	{ "uvvv", "video/vnd.dece.video" },
+	{ "dvb", "video/vnd.dvb.file" },
+	{ "fvt", "video/vnd.fvt" },
+	{ "mxu", "video/vnd.mpegurl" },
+	{ "m4u", "video/vnd.mpegurl" },
+	{ "pyv", "video/vnd.ms-playready.media.pyv" },
+	{ "uvu", "video/vnd.uvvu.mp4" },
+	{ "uvvu", "video/vnd.uvvu.mp4" },
+	{ "viv", "video/vnd.vivo" },
+	{ "webm", "video/webm" },
+	{ "f4v", "video/x-f4v" },
+	{ "fli", "video/x-fli" },
+	{ "flv", "video/x-flv" },
+	{ "m4v", "video/x-m4v" },
+	{ "mkv", "video/x-matroska" },
+	{ "mk3d", "video/x-matroska" },
+	{ "mks", "video/x-matroska" },
+	{ "mng", "video/x-mng" },
+	{ "asf", "video/x-ms-asf" },
+	{ "asx", "video/x-ms-asf" },
+	{ "vob", "video/x-ms-vob" },
+	{ "wm", "video/x-ms-wm" },
+	{ "wmv", "video/x-ms-wmv" },
+	{ "wmx", "video/x-ms-wmx" },
+	{ "wvx", "video/x-ms-wvx" },
+	{ "avi", "video/x-msvideo" },
+	{ "movie", "video/x-sgi-movie" },
+	{ "smv", "video/x-smv" },
+	{ "ice", "x-conference/x-cooltalk" },
+	{ NULL, NULL }
+};
+
+#endif /* PHP_CLI_SERVER_MIME_TYPE_MAP_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index b351cfb326..f2ff75167e 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -104,6 +104,7 @@
 
 #include "php_http_parser.h"
 #include "php_cli_server.h"
+#include "mime_type_map.h"
 
 #include "php_cli_process_title.h"
 
@@ -194,6 +195,7 @@ typedef struct php_cli_server {
 	size_t router_len;
 	socklen_t socklen;
 	HashTable clients;
+	HashTable extension_mime_types;
 } php_cli_server;
 
 typedef struct php_cli_server_http_response_status_code_pair {
@@ -201,11 +203,6 @@ typedef struct php_cli_server_http_response_status_code_pair {
 	const char *str;
 } php_cli_server_http_response_status_code_pair;
 
-typedef struct php_cli_server_ext_mime_type_pair {
-	const char *ext;
-	const char *mime_type;
-} php_cli_server_ext_mime_type_pair;
-
 static php_cli_server_http_response_status_code_pair status_map[] = {
 	{ 100, "Continue" },
 	{ 101, "Switching Protocols" },
@@ -262,64 +259,6 @@ static php_cli_server_http_response_status_code_pair template_map[] = {
 	{ 501, "<h1>%s</h1><p>Request method not supported.</p>" }
 };
 
-static php_cli_server_ext_mime_type_pair mime_type_map[] = {
-	{ "html", "text/html" },
-	{ "htm", "text/html" },
-	{ "js", "text/javascript" },
-	{ "css", "text/css" },
-	{ "gif", "image/gif" },
-	{ "jpg", "image/jpeg" },
-	{ "jpeg", "image/jpeg" },
-	{ "jpe", "image/jpeg" },
-	{ "pdf", "application/pdf" },
-	{ "png", "image/png" },
-	{ "svg", "image/svg+xml" },
-	{ "txt", "text/plain" },
-	{ "webm", "video/webm" },
-	{ "ogv", "video/ogg" },
-	{ "ogg", "audio/ogg" },
-	{ "3gp", "video/3gpp" },    /* This is standard video format used for MMS in phones */
-	{ "apk", "application/vnd.android.package-archive" },
-	{ "avi", "video/x-msvideo" },
-	{ "bmp", "image/x-ms-bmp" },
-	{ "csv", "text/comma-separated-values" },
-	{ "doc", "application/msword" },
-	{ "docx", "application/msword" },
-	{ "flac", "audio/flac" },
-	{ "gz",  "application/x-gzip" },
-	{ "gzip", "application/x-gzip" },
-	{ "ics", "text/calendar" },
-	{ "kml", "application/vnd.google-earth.kml+xml" },
-	{ "kmz", "application/vnd.google-earth.kmz" },
-	{ "m4a", "audio/mp4" },
-	{ "mp3", "audio/mpeg" },
-	{ "mp4", "video/mp4" },
-	{ "mpg", "video/mpeg" },
-	{ "mpeg", "video/mpeg" },
-	{ "mov", "video/quicktime" },
-	{ "odp", "application/vnd.oasis.opendocument.presentation" },
-	{ "ods", "application/vnd.oasis.opendocument.spreadsheet" },
-	{ "odt", "application/vnd.oasis.opendocument.text" },
-	{ "oga", "audio/ogg" },
-	{ "pdf", "application/pdf" },
-	{ "pptx", "application/vnd.ms-powerpoint" },
-	{ "pps", "application/vnd.ms-powerpoint" },
-	{ "qt", "video/quicktime" },
-	{ "swf", "application/x-shockwave-flash" },
-	{ "tar", "application/x-tar" },
-	{ "text", "text/plain" },
-	{ "tif", "image/tiff" },
-	{ "wav", "audio/wav" },
-	{ "wmv", "video/x-ms-wmv" },
-	{ "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 }
-};
-
 static int php_cli_output_is_tty = OUTPUT_NOT_CHECKED;
 
 static size_t php_cli_server_client_send_through(php_cli_server_client *client, const char *str, size_t str_len);
@@ -465,15 +404,14 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
 	smart_str_appendl_ex(buffer, "Connection: close\r\n", sizeof("Connection: close\r\n") - 1, persistent);
 } /* }}} */
 
-static const char *get_mime_type(const char *ext, size_t ext_len) /* {{{ */
+static const char *get_mime_type(const php_cli_server *server, const char *ext, size_t ext_len) /* {{{ */
 {
-	php_cli_server_ext_mime_type_pair *pair;
-	for (pair = mime_type_map; pair->ext; pair++) {
-		size_t len = strlen(pair->ext);
-		if (len == ext_len && memcmp(pair->ext, ext, len) == 0) {
-			return pair->mime_type;
-		}
+	char *mime_type = NULL;
+
+	if (zend_hash_find(&server->extension_mime_types, ext, ext_len + 1, (void **) &mime_type) == SUCCESS) {
+		return mime_type;
 	}
+
 	return NULL;
 } /* }}} */
 
@@ -2044,7 +1982,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
 	{
 		php_cli_server_chunk *chunk;
 		smart_str buffer = { 0 };
-		const char *mime_type = get_mime_type(client->request.ext, client->request.ext_len);
+		const char *mime_type = get_mime_type(server, client->request.ext, client->request.ext_len);
 		if (!mime_type) {
 			mime_type = "application/octet-stream";
 		}
@@ -2204,9 +2142,30 @@ static int php_cli_server_dispatch(php_cli_server *server, php_cli_server_client
 }
 /* }}} */
 
+static int php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_server_ext_mime_type_pair *mime_type_map) /* {{{ */
+{
+	const php_cli_server_ext_mime_type_pair *pair;
+
+	if (zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1) != SUCCESS) {
+		return FAILURE;
+	}
+
+	for (pair = mime_type_map; pair->ext; pair++) {
+		size_t ext_len = 0, mime_type_len = 0;
+
+		ext_len = strlen(pair->ext);
+		mime_type_len = strlen(pair->mime_type);
+
+		zend_hash_add(&server->extension_mime_types, pair->ext, ext_len + 1, (void *) pair->mime_type, mime_type_len + 1, NULL);
+	}
+
+	return SUCCESS;
+} /* }}} */
+
 static void php_cli_server_dtor(php_cli_server *server TSRMLS_DC) /* {{{ */
 {
 	zend_hash_destroy(&server->clients);
+	zend_hash_destroy(&server->extension_mime_types);
 	if (server->server_sock >= 0) {
 		closesocket(server->server_sock);
 	}
@@ -2324,6 +2283,11 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
 		server->router_len = 0;
 	}
 
+	if (php_cli_server_mime_type_ctor(server, mime_type_map) == FAILURE) {
+		retval = FAILURE;
+		goto out;
+	}
+
 	server->is_running = 1;
 out:
 	if (retval != SUCCESS) {
diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt
index 09a6ba6d23..6250c9aec0 100644
--- a/sapi/cli/tests/bug61977.phpt
+++ b/sapi/cli/tests/bug61977.phpt
@@ -48,7 +48,7 @@ foo.html => Content-Type: text/html; charset=UTF-8
 foo.htm => Content-Type: text/html; charset=UTF-8
 foo.svg => Content-Type: image/svg+xml
 foo.css => Content-Type: text/css; charset=UTF-8
-foo.js => Content-Type: text/javascript; charset=UTF-8
+foo.js => Content-Type: application/javascript
 foo.png => Content-Type: image/png
 foo.webm => Content-Type: video/webm
 foo.ogv => Content-Type: video/ogg
diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c
index 87fd9328f2..30d10ed0a0 100644
--- a/sapi/continuity/capi.c
+++ b/sapi/continuity/capi.c
@@ -462,7 +462,7 @@ int phpFinit(lstTset * opt)
    core_globals = ts_resource(core_globals_id);
 
    logFmsg(0, "mod/php: PHP Interface v3 (module)");
-   logFmsg(0, "mod/php: Copyright (c) 1999-2013 The PHP Group. All rights reserved.");
+   logFmsg(0, "mod/php: Copyright (c) 1999-2014 The PHP Group. All rights reserved.");
 
    sapi_startup(&capi_sapi_module);
    capi_sapi_module.startup(&capi_sapi_module);