From a459c734b4a979e74e251da5e768a4546edf5fd0 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Mon, 28 Jul 2003 01:58:33 +0000 Subject: [PATCH] Sync with IANA registry and W3C recommended types, the latter being necessary because the W3C committees are too lame to finish their own type registrations. Nevertheless, they are already in use. Submitted by: Roy Fielding Reviewed by: Andre Malo, Justin Erenkrantz, Sander Striker, Erik Abele git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100804 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 + docs/conf/mime.types | 185 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 154 insertions(+), 33 deletions(-) diff --git a/CHANGES b/CHANGES index ccccedc255d..7eb8c085ab2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ Changes with Apache 2.0.48 + *) Update mime.types to include latest IANA and W3C types. [Roy Fielding] + *) mod_ext_filter: Set additional environment variables for use by the external filter. PR 20944. [Andrew Ho, Jeff Trawick] diff --git a/docs/conf/mime.types b/docs/conf/mime.types index a0849a834cf..91b182bdefe 100644 --- a/docs/conf/mime.types +++ b/docs/conf/mime.types @@ -8,23 +8,26 @@ # please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type # registry is at . -# MIME type Extension -application/EDI-Consent -application/EDI-X12 -application/EDIFACT +# MIME type Extensions application/activemessage application/andrew-inset ez application/applefile application/atomicmail -application/batch-SMTP +application/batch-smtp application/beep+xml application/cals-1840 +application/cnrp+xml application/commonground +application/cpl+xml application/cybercash application/dca-rft application/dec-dx application/dvcs +application/edi-consent +application/edifact +application/edi-x12 application/eshop +application/font-tdpfr application/http application/hyperstudio application/iges @@ -36,13 +39,12 @@ application/index.vnd application/iotp application/ipp application/isup -application/font-tdpfr application/mac-binhex40 hqx application/mac-compactpro cpt application/macwriteii application/marc application/mathematica -application/mathematica-old +application/mathml+xml mathml application/msword doc application/news-message-id application/news-transmission @@ -66,7 +68,10 @@ application/postscript ai eps ps application/prs.alvestrand.titrax-sheet application/prs.cww application/prs.nprend +application/prs.plucker application/qsig +application/rdf+xml rdf +application/reginfo+xml application/remote-printing application/riscos application/rtf @@ -80,35 +85,49 @@ application/sgml-open-catalog application/sieve application/slate application/smil smi smil +application/srgs gram +application/srgs+xml grxml application/timestamp-query application/timestamp-reply +application/tve-trigger application/vemmi -application/vnd.3M.Post-it-Notes -application/vnd.FloGraphIt +application/vnd.3gpp.pic-bw-large +application/vnd.3gpp.pic-bw-small +application/vnd.3gpp.pic-bw-var +application/vnd.3gpp.sms +application/vnd.3m.post-it-notes application/vnd.accpac.simply.aso application/vnd.accpac.simply.imp application/vnd.acucobol +application/vnd.acucorp +application/vnd.adobe.xfdf application/vnd.aether.imp +application/vnd.amiga.ami application/vnd.anser-web-certificate-issue-initiation application/vnd.anser-web-funds-transfer-initiation application/vnd.audiograph -application/vnd.businessobjects +application/vnd.blueice.multipass application/vnd.bmi +application/vnd.businessobjects application/vnd.canon-cpdl application/vnd.canon-lips +application/vnd.cinderella application/vnd.claymore application/vnd.commerce-battelle application/vnd.commonspace -application/vnd.comsocaller application/vnd.contact.cmsg application/vnd.cosmocaller +application/vnd.criticaltools.wbs+xml +application/vnd.ctc-posml application/vnd.cups-postscript application/vnd.cups-raster application/vnd.cups-raw -application/vnd.ctc-posml +application/vnd.curl application/vnd.cybank +application/vnd.data-vision.rdz application/vnd.dna application/vnd.dpgraph +application/vnd.dreamfactory application/vnd.dxr application/vnd.ecdis-update application/vnd.ecowin.chart @@ -127,6 +146,8 @@ application/vnd.ericsson.quickcall application/vnd.eudora.data application/vnd.fdf application/vnd.ffsns +application/vnd.fints +application/vnd.flographit application/vnd.framemaker application/vnd.fsc.weblaunch application/vnd.fujitsu.oasys @@ -140,22 +161,27 @@ application/vnd.fujixerox.docuworks.binder application/vnd.fut-misnet application/vnd.grafeq application/vnd.groove-account +application/vnd.groove-help application/vnd.groove-identity-message application/vnd.groove-injector application/vnd.groove-tool-message application/vnd.groove-tool-template application/vnd.groove-vcard +application/vnd.hbci application/vnd.hhe.lesson-player -application/vnd.hp-HPGL -application/vnd.hp-PCL -application/vnd.hp-PCLXL +application/vnd.hp-hpgl application/vnd.hp-hpid application/vnd.hp-hps +application/vnd.hp-pcl +application/vnd.hp-pclxl application/vnd.httphone application/vnd.hzn-3d-crossword application/vnd.ibm.afplinedata -application/vnd.ibm.MiniPay +application/vnd.ibm.electronic-media +application/vnd.ibm.minipay application/vnd.ibm.modcap +application/vnd.ibm.rights-management +application/vnd.ibm.secure-container application/vnd.informix-visionary application/vnd.intercon.formnet application/vnd.intertrust.digibox @@ -172,7 +198,20 @@ application/vnd.japannet-registration-wakeup application/vnd.japannet-setstore-wakeup application/vnd.japannet-verification application/vnd.japannet-verification-wakeup +application/vnd.jisp +application/vnd.kde.karbon +application/vnd.kde.kchart +application/vnd.kde.kformula +application/vnd.kde.kivio +application/vnd.kde.kontour +application/vnd.kde.kpresenter +application/vnd.kde.kspread +application/vnd.kde.kword +application/vnd.kenameaapp application/vnd.koan +application/vnd.liberty-request+xml +application/vnd.llamagraphics.life-balance.desktop +application/vnd.llamagraphics.life-balance.exchange+xml application/vnd.lotus-1-2-3 application/vnd.lotus-approach application/vnd.lotus-freelance @@ -183,14 +222,20 @@ application/vnd.lotus-wordpro application/vnd.mcd application/vnd.mediastation.cdkey application/vnd.meridian-slingshot +application/vnd.micrografx.flo +application/vnd.micrografx.igx application/vnd.mif mif application/vnd.minisoft-hp3000-save application/vnd.mitsubishi.misty-guard.trustweb application/vnd.mobius.daf application/vnd.mobius.dis +application/vnd.mobius.mbk +application/vnd.mobius.mqy application/vnd.mobius.msl application/vnd.mobius.plc application/vnd.mobius.txf +application/vnd.mophun.application +application/vnd.mophun.certificate application/vnd.motorola.flexsuite application/vnd.motorola.flexsuite.adsi application/vnd.motorola.flexsuite.fis @@ -207,6 +252,7 @@ application/vnd.ms-powerpoint ppt application/vnd.ms-project application/vnd.ms-tnef application/vnd.ms-works +application/vnd.ms-wpl application/vnd.mseq application/vnd.msign application/vnd.music-niff @@ -215,9 +261,10 @@ application/vnd.netfpx application/vnd.noblenet-directory application/vnd.noblenet-sealer application/vnd.noblenet-web -application/vnd.novadigm.EDM -application/vnd.novadigm.EDX -application/vnd.novadigm.EXT +application/vnd.novadigm.edm +application/vnd.novadigm.edx +application/vnd.novadigm.ext +application/vnd.obn application/vnd.osa.netdeploy application/vnd.palm application/vnd.pg.format @@ -231,14 +278,18 @@ application/vnd.powerbuilder75-s application/vnd.previewsystems.box application/vnd.publishare-delta-tree application/vnd.pvi.ptid1 +application/vnd.pwg-multiplexed application/vnd.pwg-xhtml-print+xml +application/vnd.quark.quarkxpress application/vnd.rapid application/vnd.s3sms +application/vnd.sealed.net application/vnd.seemail application/vnd.shana.informed.formdata application/vnd.shana.informed.formtemplate application/vnd.shana.informed.interchange application/vnd.shana.informed.package +application/vnd.smaf application/vnd.sss-cod application/vnd.sss-dtf application/vnd.sss-ntf @@ -248,12 +299,11 @@ application/vnd.swiftview-ics application/vnd.triscape.mxs application/vnd.trueapp application/vnd.truedoc -application/vnd.tve-trigger application/vnd.ufdl application/vnd.uplanet.alert application/vnd.uplanet.alert-wbxml -application/vnd.uplanet.bearer-choice-wbxml application/vnd.uplanet.bearer-choice +application/vnd.uplanet.bearer-choice-wbxml application/vnd.uplanet.cacheop application/vnd.uplanet.cacheop-wbxml application/vnd.uplanet.channel @@ -267,7 +317,9 @@ application/vnd.vcx application/vnd.vectorworks application/vnd.vidsoft.vidconference application/vnd.visio +application/vnd.visionary application/vnd.vividence.scriptfile +application/vnd.vsf application/vnd.wap.sic application/vnd.wap.slc application/vnd.wap.wbxml wbxml @@ -276,9 +328,15 @@ application/vnd.wap.wmlscriptc wmlsc application/vnd.webturbo application/vnd.wrq-hp3000-labelled application/vnd.wt.stf +application/vnd.wv.csp+wbxml application/vnd.xara application/vnd.xfdl +application/vnd.yamaha.hv-dic +application/vnd.yamaha.hv-script +application/vnd.yamaha.hv-voice application/vnd.yellowriver-custom-menu +application/voicexml+xml vxml +application/watcherinfo+xml application/whoispp-query application/whoispp-response application/wita @@ -317,22 +375,56 @@ application/x-ustar ustar application/x-wais-source src application/x400-bp application/xhtml+xml xhtml xht -application/xml -application/xml-dtd +application/xslt+xml xslt +application/xml xml xsl +application/xml-dtd dtd application/xml-external-parsed-entity application/zip zip audio/32kadpcm +audio/amr +audio/amr-wb audio/basic au snd +audio/cn +audio/dat12 +audio/dsr-es201108 +audio/dvi4 +audio/evrc +audio/evrc0 +audio/g722 audio/g.722.1 +audio/g723 +audio/g726-16 +audio/g726-24 +audio/g726-32 +audio/g726-40 +audio/g728 +audio/g729 +audio/g729D +audio/g729E +audio/gsm +audio/gsm-efr +audio/l8 audio/l16 +audio/l20 +audio/l24 +audio/lpc audio/midi mid midi kar -audio/mp4a-latm +audio/mpa audio/mpa-robust +audio/mp4a-latm audio/mpeg mpga mp2 mp3 audio/parityfec +audio/pcma +audio/pcmu audio/prs.sid +audio/qcelp +audio/red +audio/smv +audio/smv0 audio/telephone-event audio/tone +audio/vdvi +audio/vnd.3gpp.iufp audio/vnd.cisco.nse audio/vnd.cns.anp1 audio/vnd.cns.inf1 @@ -348,6 +440,7 @@ audio/vnd.qcelp audio/vnd.rhetorex.32kadpcm audio/vnd.vmx.cvsd audio/x-aiff aif aiff aifc +audio/x-alaw-basic audio/x-mpegurl m3u audio/x-pn-realaudio ram rm audio/x-pn-realaudio-plugin rpm @@ -356,7 +449,7 @@ audio/x-wav wav chemical/x-pdb pdb chemical/x-xyz xyz image/bmp bmp -image/cgm +image/cgm cgm image/g3fax image/gif gif image/ief ief @@ -365,7 +458,10 @@ image/naplps image/png png image/prs.btif image/prs.pti +image/svg+xml svg +image/t38 image/tiff tiff tif +image/tiff-fx image/vnd.cns.inf2 image/vnd.djvu djvu djv image/vnd.dwg @@ -375,12 +471,15 @@ image/vnd.fpx image/vnd.fst image/vnd.fujixerox.edmics-mmr image/vnd.fujixerox.edmics-rlc +image/vnd.globalgraphics.pgb image/vnd.mix +image/vnd.ms-modi image/vnd.net-fpx image/vnd.svf image/vnd.wap.wbmp wbmp image/vnd.xiff image/x-cmu-raster ras +image/x-icon ico image/x-portable-anymap pnm image/x-portable-bitmap pbm image/x-portable-graymap pgm @@ -397,6 +496,8 @@ message/news message/partial message/rfc822 message/s-http +message/sip +message/sipfrag model/iges igs iges model/mesh msh mesh silo model/vnd.dwf @@ -405,6 +506,8 @@ model/vnd.gdl model/vnd.gs-gdl model/vnd.gtw model/vnd.mts +model/vnd.parasolid.transmit.binary +model/vnd.parasolid.transmit.text model/vnd.vtu model/vrml wrl vrml multipart/alternative @@ -420,7 +523,7 @@ multipart/related multipart/report multipart/signed multipart/voice-message -text/calendar +text/calendar ics ifb text/css css text/directory text/enriched @@ -432,40 +535,56 @@ text/rfc822-headers text/richtext rtx text/rtf rtf text/sgml sgml sgm -text/tab-separated-values tsv text/t140 +text/tab-separated-values tsv text/uri-list -text/vnd.DMClientScript -text/vnd.IPTC.NITF -text/vnd.IPTC.NewsML text/vnd.abc text/vnd.curl -text/vnd.flatland.3dml +text/vnd.dmclientscript text/vnd.fly text/vnd.fmi.flexstor text/vnd.in3d.3dml text/vnd.in3d.spot +text/vnd.iptc.nitf +text/vnd.iptc.newsml text/vnd.latex-z text/vnd.motorola.reflex text/vnd.ms-mediapackage +text/vnd.net2phone.commcenter.command +text/vnd.sun.j2me.app-descriptor text/vnd.wap.si text/vnd.wap.sl text/vnd.wap.wml wml text/vnd.wap.wmlscript wmls text/x-setext etx -text/xml xml xsl +text/xml text/xml-external-parsed-entity +video/bmpeg +video/bt656 +video/celb +video/dv +video/h261 +video/h263 +video/h263-1998 +video/h263-2000 +video/jpeg +video/mp1s +video/mp2p +video/mp2t video/mp4v-es +video/mpv video/mpeg mpeg mpg mpe +video/nv video/parityfec video/pointer video/quicktime qt mov +video/smpte292m video/vnd.fvt video/vnd.motorola.video video/vnd.motorola.videop video/vnd.mpegurl mxu -video/vnd.mts video/vnd.nokia.interleaved-multimedia +video/vnd.objectvideo video/vnd.vivo video/x-msvideo avi video/x-sgi-movie movie