You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2012/03/17 10:08:44 UTC
svn commit: r1301895 - /httpd/httpd/branches/2.4.x/docs/conf/mime.types
Author: fielding
Date: Sat Mar 17 09:08:44 2012
New Revision: 1301895
URL: http://svn.apache.org/viewvc?rev=1301895&view=rev
Log:
merge with trunk r1301894
Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.
Modified:
httpd/httpd/branches/2.4.x/docs/conf/mime.types (contents, props changed)
Modified: httpd/httpd/branches/2.4.x/docs/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/mime.types?rev=1301895&r1=1301894&r2=1301895&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/mime.types Sat Mar 17 09:08:44 2012
@@ -52,6 +52,7 @@ application/davmount+xml davmount
# application/dialog-info+xml
# application/dicom
# application/dns
+application/docbook+xml dbk
# application/dskpp+xml
application/dssc+der dssc
application/dssc+xml xdssc
@@ -71,6 +72,9 @@ application/exi exi
# application/fits
application/font-tdpfr pfr
# application/framework-attributes+xml
+application/gml+xml gml
+application/gpx+xml gpx
+application/gxf gxf
# application/h224
# application/held+xml
# application/http
@@ -95,6 +99,7 @@ application/java-serialized-object ser
application/java-vm class
application/javascript js
application/json json
+application/jsonml+json jsonml
# application/kpml-request+xml
# application/kpml-response+xml
application/lost+xml lostxml
@@ -121,6 +126,7 @@ application/mathml+xml mathml
application/mbox mbox
# application/media_control+xml
application/mediaservercontrol+xml mscml
+application/metalink+xml metalink
application/metalink4+xml meta4
application/mets+xml mets
# application/mikey
@@ -145,10 +151,11 @@ application/mxf mxf
# application/nss
# application/ocsp-request
# application/ocsp-response
-application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy
+application/octet-stream bin dms lrf mar so dist distz pkg bpk dump elc deploy
application/oda oda
application/oebps-package+xml opf
application/ogg ogx
+application/omdoc+xml omdoc
application/onenote onetoc onetoc2 onetmp onepkg
application/oxps oxps
# application/parityfec
@@ -227,6 +234,7 @@ application/sparql-results+xml srx
application/srgs gram
application/srgs+xml grxml
application/sru+xml sru
+application/ssdl+xml ssdl
application/ssml+xml ssml
# application/tamp-apex-update
# application/tamp-apex-update-confirm
@@ -263,6 +271,7 @@ application/vnd.accpac.simply.imp imp
application/vnd.acucobol acu
application/vnd.acucorp atc acutc
application/vnd.adobe.air-application-installer-package+zip air
+application/vnd.adobe.formscentral.fcdt fcdt
application/vnd.adobe.fxp fxp fxpl
# application/vnd.adobe.partial-upload
application/vnd.adobe.xdp+xml xdp
@@ -327,6 +336,7 @@ application/vnd.cups-ppd ppd
application/vnd.curl.car car
application/vnd.curl.pcurl pcurl
# application/vnd.cybank
+application/vnd.dart dart
application/vnd.data-vision.rdz rdz
application/vnd.dece.data uvf uvvf uvd uvvd
application/vnd.dece.ttml+xml uvt uvvt
@@ -340,6 +350,7 @@ application/vnd.dolby.mlp mlp
# application/vnd.dolby.mobile.2
application/vnd.dpgraph dpg
application/vnd.dreamfactory dfac
+application/vnd.ds-keypoint kpxx
application/vnd.dvb.ait ait
# application/vnd.dvb.dvbj
# application/vnd.dvb.esgcontainer
@@ -461,7 +472,7 @@ application/vnd.hp-pcl pcl
application/vnd.hp-pclxl pclxl
# application/vnd.httphone
application/vnd.hydrostatix.sof-data sfd-hdstx
-application/vnd.hzn-3d-crossword x3d
+# application/vnd.hzn-3d-crossword
# application/vnd.ibm.afplinedata
# application/vnd.ibm.electronic-media
application/vnd.ibm.minipay mpy
@@ -476,6 +487,7 @@ application/vnd.immervision-ivu ivu
# application/vnd.informix-visionary
# application/vnd.infotech.project
# application/vnd.infotech.project+xml
+# application/vnd.innopath.wamp.notification
application/vnd.insors.igm igm
application/vnd.intercon.formnet xpw xpx
application/vnd.intergeo i2g
@@ -486,7 +498,9 @@ application/vnd.intu.qfx qfx
# application/vnd.iptc.g2.conceptitem+xml
# application/vnd.iptc.g2.knowledgeitem+xml
# application/vnd.iptc.g2.newsitem+xml
+# application/vnd.iptc.g2.newsmessage+xml
# application/vnd.iptc.g2.packageitem+xml
+# application/vnd.iptc.g2.planningitem+xml
application/vnd.ipunplugged.rcprofile rcprofile
application/vnd.irepository.package+xml irp
application/vnd.is-xpr xpr
@@ -565,6 +579,7 @@ application/vnd.mozilla.xul+xml xul
application/vnd.ms-artgalry cil
# application/vnd.ms-asf
application/vnd.ms-cab-compressed cab
+# application/vnd.ms-color.iccprofile
application/vnd.ms-excel xls xlm xla xlc xlt xlw
application/vnd.ms-excel.addin.macroenabled.12 xlam
application/vnd.ms-excel.sheet.binary.macroenabled.12 xlsb
@@ -576,6 +591,8 @@ application/vnd.ms-ims ims
application/vnd.ms-lrm lrm
# application/vnd.ms-office.activex+xml
application/vnd.ms-officetheme thmx
+# application/vnd.ms-opentype
+# application/vnd.ms-package.obfuscated-opentype
application/vnd.ms-pki.seccat cat
application/vnd.ms-pki.stl stl
# application/vnd.ms-playready.initiator+xml
@@ -585,6 +602,7 @@ application/vnd.ms-powerpoint.presentati
application/vnd.ms-powerpoint.slide.macroenabled.12 sldm
application/vnd.ms-powerpoint.slideshow.macroenabled.12 ppsm
application/vnd.ms-powerpoint.template.macroenabled.12 potm
+# application/vnd.ms-printing.printticket+xml
application/vnd.ms-project mpp mpt
# application/vnd.ms-tnef
# application/vnd.ms-wmdrm.lic-chlg-req
@@ -609,6 +627,7 @@ application/vnd.mynfc taglet
# application/vnd.nervana
# application/vnd.netfpx
application/vnd.neurolanguage.nlu nlu
+application/vnd.nitf ntf nitf
application/vnd.noblenet-directory nnd
application/vnd.noblenet-sealer nns
application/vnd.noblenet-web nnw
@@ -783,6 +802,7 @@ application/vnd.openxmlformats-officedoc
application/vnd.osgeo.mapguide.package mgp
# application/vnd.osgi.bundle
application/vnd.osgi.dp dp
+application/vnd.osgi.subsystem esa
# application/vnd.otps.ct-kip+xml
application/vnd.palm pdb pqa oprc
# application/vnd.paos.xml
@@ -833,7 +853,9 @@ application/vnd.recordare.musicxml+xml
application/vnd.rig.cryptonote cryptonote
application/vnd.rim.cod cod
application/vnd.rn-realmedia rm
+application/vnd.rn-realmedia-vbr rmvb
application/vnd.route66.link66+xml link66
+# application/vnd.rs-274x
# application/vnd.ruckus.download
# application/vnd.s3sms
application/vnd.sailingtracker.track st
@@ -990,26 +1012,35 @@ application/wspolicy+xml wspolicy
application/x-7z-compressed 7z
application/x-abiword abw
application/x-ace-compressed ace
+# application/x-amf
+application/x-apple-diskimage dmg
application/x-authorware-bin aab x32 u32 vox
application/x-authorware-map aam
application/x-authorware-seg aas
application/x-bcpio bcpio
application/x-bittorrent torrent
+application/x-blorb blb blorb
application/x-bzip bz
application/x-bzip2 bz2 boz
+application/x-cbr cbr cba cbt cbz cb7
application/x-cdlink vcd
+application/x-cfs-compressed cfs
application/x-chat chat
application/x-chess-pgn pgn
+application/x-conference nsc
# application/x-compress
application/x-cpio cpio
application/x-csh csh
application/x-debian-package deb udeb
+application/x-dgc-compressed dgc
application/x-director dir dcr dxr cst cct cxt w3d fgd swa
application/x-doom wad
application/x-dtbncx+xml ncx
application/x-dtbook+xml dtb
application/x-dtbresource+xml res
application/x-dvi dvi
+application/x-envoy evy
+application/x-eva eva
application/x-font-bdf bdf
# application/x-font-dos
# application/x-font-framemaker
@@ -1025,15 +1056,24 @@ application/x-font-ttf ttf ttc
application/x-font-type1 pfa pfb pfm afm
application/x-font-woff woff
# application/x-font-vfont
+application/x-freearc arc
application/x-futuresplash spl
+application/x-gca-compressed gca
+application/x-glulx ulx
application/x-gnumeric gnumeric
+application/x-gramps-xml gramps
application/x-gtar gtar
# application/x-gzip
application/x-hdf hdf
+application/x-install-instructions install
+application/x-iso9660-image iso
application/x-java-jnlp-file jnlp
application/x-latex latex
+application/x-lzh-compressed lzh lha
+application/x-mie mie
application/x-mobipocket-ebook prc mobi
application/x-ms-application application
+application/x-ms-shortcut lnk
application/x-ms-wmd wmd
application/x-ms-wmz wmz
application/x-ms-xbap xbap
@@ -1043,36 +1083,47 @@ application/x-mscardfile crd
application/x-msclip clp
application/x-msdownload exe dll com bat msi
application/x-msmediaview mvb m13 m14
-application/x-msmetafile wmf
+application/x-msmetafile wmf wmz emf emz
application/x-msmoney mny
application/x-mspublisher pub
application/x-msschedule scd
application/x-msterminal trm
application/x-mswrite wri
application/x-netcdf nc cdf
+application/x-nzb nzb
application/x-pkcs12 p12 pfx
application/x-pkcs7-certificates p7b spc
application/x-pkcs7-certreqresp p7r
application/x-rar-compressed rar
+application/x-research-info-systems ris
application/x-sh sh
application/x-shar shar
application/x-shockwave-flash swf
application/x-silverlight-app xap
+application/x-sql sql
application/x-stuffit sit
application/x-stuffitx sitx
+application/x-subrip srt
application/x-sv4cpio sv4cpio
application/x-sv4crc sv4crc
+application/x-t3vm-image t3
+application/x-tads gam
application/x-tar tar
application/x-tcl tcl
application/x-tex tex
application/x-tex-tfm tfm
application/x-texinfo texinfo texi
+application/x-tgif obj
application/x-ustar ustar
application/x-wais-source src
application/x-x509-ca-cert der crt
application/x-xfig fig
+application/x-xliff+xml xlf
application/x-xpinstall xpi
+application/x-xz xz
+application/x-zmachine z1 z2 z3 z4 z5 z6 z7 z8
# application/x400-bp
+application/xaml+xml xaml
# application/xcap-att+xml
# application/xcap-caps+xml
application/xcap-diff+xml xdf
@@ -1089,6 +1140,7 @@ application/xml-dtd dtd
# application/xml-external-parsed-entity
# application/xmpp+xml
application/xop+xml xop
+application/xproc+xml xpl
application/xslt+xml xslt
application/xspf+xml xspf
application/xv+xml mxml xhvml xvml xvm
@@ -1152,6 +1204,7 @@ audio/basic au snd
# audio/gsm-hr-08
# audio/ilbc
# audio/ip-mr_v2.5
+# audio/isac
# audio/l16
# audio/l20
# audio/l24
@@ -1165,7 +1218,9 @@ audio/mp4 mp4a
# audio/mpa-robust
audio/mpeg mpga mp2 mp2a mp3 m2a m3a
# audio/mpeg4-generic
+# audio/musepack
audio/ogg oga ogg spx
+# audio/opus
# audio/parityfec
# audio/pcma
# audio/pcma-wb
@@ -1177,6 +1232,8 @@ audio/ogg oga ogg spx
# audio/rtp-enc-aescm128
# audio/rtp-midi
# audio/rtx
+audio/s3m s3m
+audio/silk sil
# audio/smv
# audio/smv0
# audio/smv-qcp
@@ -1212,7 +1269,7 @@ audio/vnd.digital-winds eol
audio/vnd.dra dra
audio/vnd.dts dts
audio/vnd.dts.hd dtshd
-# audio/vnd.dvb.file dvb
+# audio/vnd.dvb.file
# audio/vnd.everad.plj
# audio/vnd.hns.audio
audio/vnd.lucent.voice lvp
@@ -1233,12 +1290,17 @@ audio/vnd.rip rip
audio/webm weba
audio/x-aac aac
audio/x-aiff aif aiff aifc
+audio/x-caf caf
+audio/x-flac flac
+audio/x-matroska mka
audio/x-mpegurl m3u
audio/x-ms-wax wax
audio/x-ms-wma wma
audio/x-pn-realaudio ram ra
audio/x-pn-realaudio-plugin rmp
+# audio/x-tta
audio/x-wav wav
+audio/xm xm
chemical/x-cdx cdx
chemical/x-cif cif
chemical/x-cmdf cmdf
@@ -1262,6 +1324,7 @@ image/ktx ktx
image/png png
image/prs.btif btif
# image/prs.pti
+image/sgi sgi
image/svg+xml svg svgz
# image/t38
image/tiff tiff tif
@@ -1282,6 +1345,7 @@ image/vnd.fujixerox.edmics-rlc rlc
# image/vnd.microsoft.icon
# image/vnd.mix
image/vnd.ms-modi mdi
+image/vnd.ms-photo wdp
image/vnd.net-fpx npx
# image/vnd.radiance
# image/vnd.sealed.png
@@ -1291,10 +1355,12 @@ image/vnd.net-fpx npx
image/vnd.wap.wbmp wbmp
image/vnd.xiff xif
image/webp webp
+image/x-3ds 3ds
image/x-cmu-raster ras
image/x-cmx cmx
image/x-freehand fh fhc fh4 fh5 fh7
image/x-icon ico
+image/x-mrsid-image sid
image/x-pcx pcx
image/x-pict pic pct
image/x-portable-anymap pnm
@@ -1302,6 +1368,7 @@ image/x-portable-bitmap pbm
image/x-portable-graymap pgm
image/x-portable-pixmap ppm
image/x-rgb rgb
+image/x-tga tga
image/x-xbitmap xbm
image/x-xpixmap xpm
image/x-xwindowdump xwd
@@ -1341,6 +1408,9 @@ model/vnd.mts mts
# model/vnd.parasolid.transmit.text
model/vnd.vtu vtu
model/vrml wrl vrml
+model/x3d+binary x3db x3dbz
+model/x3d+vrml x3dv x3dvz
+model/x3d+xml x3d x3dz
# multipart/alternative
# multipart/appledouble
# multipart/byteranges
@@ -1356,6 +1426,7 @@ model/vrml wrl vrml
# multipart/signed
# multipart/voice-message
# text/1d-interleaved-parityfec
+text/cache-manifest appcache
text/calendar ics ifb
text/css css
text/csv csv
@@ -1416,9 +1487,12 @@ text/vnd.wap.wmlscript wmls
text/x-asm s asm
text/x-c c cc cxx cpp h hh dic
text/x-fortran f for f77 f90
-text/x-pascal p pas
text/x-java-source java
+text/x-opml opml
+text/x-pascal p pas
+text/x-nfo nfo
text/x-setext etx
+text/x-sfv sfv
text/x-uuencode uu
text/x-vcalendar vcs
text/x-vcard vcf
@@ -1500,11 +1574,15 @@ video/x-f4v f4v
video/x-fli fli
video/x-flv flv
video/x-m4v m4v
+video/x-matroska mkv mk3d mks
+video/x-mng mng
video/x-ms-asf asf asx
+video/x-ms-vob vob
video/x-ms-wm wm
video/x-ms-wmv wmv
video/x-ms-wmx wmx
video/x-ms-wvx wvx
video/x-msvideo avi
video/x-sgi-movie movie
+video/x-smv smv
x-conference/x-cooltalk ice
Propchange: httpd/httpd/branches/2.4.x/docs/conf/mime.types
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 17 09:08:44 2012
@@ -0,0 +1,3 @@
+/httpd/httpd/branches/revert-ap-ldap/docs/conf/mime.types:1150158-1150173
+/httpd/httpd/branches/wombat-integration/docs/conf/mime.types:723609-723841
+/httpd/httpd/trunk/docs/conf/mime.types:1200450-1301894