diff options
| author | Austin Ziegler <austin@zieglers.ca> | 2013-02-09 11:42:02 -0500 |
|---|---|---|
| committer | Austin Ziegler <austin@zieglers.ca> | 2013-02-09 11:42:02 -0500 |
| commit | 803e08baf3d857b113c4cef41dfd4247b2b91b27 (patch) | |
| tree | 6cd74609cf463799633009346e39652a0793870b | |
| parent | 19778526f58040e2076573e0cb94a7c557416a6f (diff) | |
| parent | 1a0dcc21e2b6f471c379d11785c7b094ecb9e158 (diff) | |
| download | git-803e08baf3d857b113c4cef41dfd4247b2b91b27.tar.gz | |
Merge branch 'master' of github-halostatue:halostatue/mime-typesv1.21
* 'master' of github-halostatue:halostatue/mime-types:
Add extensions appcache and manifest for text/cache-manifest
Add extension webapp for application/x-web-app-manifest+json
Add extension webp for image/webp
Add extension svgz for image/svg+xml
Add extension xpi for application/x-xpinstall
Add extension crx for application/x-chrome-extension
Add extension eot for application/vnd.ms-fontobject
| -rw-r--r-- | lib/mime/types/application.nonstandard | 4 | ||||
| -rw-r--r-- | lib/mime/types/image | 3 | ||||
| -rw-r--r-- | lib/mime/types/text.nonstandard | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/mime/types/application.nonstandard b/lib/mime/types/application.nonstandard index 52bfcd918f..3ba3911b17 100644 --- a/lib/mime/types/application.nonstandard +++ b/lib/mime/types/application.nonstandard @@ -17,6 +17,7 @@ *application/vda 'LTSW *application/vnd.adobe.air-application-installer-package+zip @air :base64 *application/vnd.android.package-archive @apk +*application/vnd.ms-fontobject @eot *application/vnd.rn-realmedia @rm *application/vnd.stardivision.calc @sdc *application/vnd.stardivision.chart @sds @@ -43,6 +44,7 @@ application/x-bleeper @bleep :base64 application/x-bzip2 @bz2 application/x-cdlink @vcd application/x-chess-pgn @pgn +application/x-chrome-extension @crx application/x-clariscad application/x-compressed @z,Z :base64 'LTSW application/x-cpio @cpio :base64 'LTSW @@ -122,6 +124,8 @@ application/x-troff-ms @ms 'LTSW application/x-ustar @ustar :base64 'LTSW application/x-VMSBACKUP @bck :base64 application/x-wais-source @src 'LTSW +application/x-web-app-manifest+json @webapp application/x-Wingz @wz application/x-wordperfect6.1 @wp6 application/x-x509-ca-cert @crt :base64 +application/x-xpinstall @xpi diff --git a/lib/mime/types/image b/lib/mime/types/image index e84357bebc..33511fe712 100644 --- a/lib/mime/types/image +++ b/lib/mime/types/image @@ -14,7 +14,7 @@ image/png @png :base64 'IANA,[Randers-Pehrson] image/prs.btif 'IANA,[Simon] image/prs.pti 'IANA,[Laun] image/pwg-raster 'IANA,[Sweet] -image/svg+xml @svg :8bit 'IANA,[W3C] +image/svg+xml @svg,svgz :8bit 'IANA,[W3C] image/t38 'IANA,RFC3362 image/tiff @tiff,tif :base64 'IANA,RFC2302 image/tiff-fx 'IANA,RFC3950 @@ -43,3 +43,4 @@ image/vnd.sealedmedia.softseal.jpg 'IANA,[Petersen] image/vnd.svf 'IANA,[Moline] image/vnd.wap.wbmp 'IANA,[Stark] image/vnd.xiff 'IANA,[S.Martin] +image/webp @webp diff --git a/lib/mime/types/text.nonstandard b/lib/mime/types/text.nonstandard index 7f117d7a34..196f2ec047 100644 --- a/lib/mime/types/text.nonstandard +++ b/lib/mime/types/text.nonstandard @@ -1,3 +1,4 @@ +text/cache-manifest @appcache,manifest text/x-coffescript @coffee :8bit text/x-component @htc :8bit text/x-setext @etx |