httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r774501 - /httpd/httpd/branches/2.2.x/docs/conf/mime.types
Date Wed, 13 May 2009 19:51:02 GMT
Author: fielding
Date: Wed May 13 19:50:58 2009
New Revision: 774501

URL: http://svn.apache.org/viewvc?rev=774501&view=rev
Log:
merge from trunk r774184

Modified:
    httpd/httpd/branches/2.2.x/docs/conf/mime.types   (contents, props changed)

Modified: httpd/httpd/branches/2.2.x/docs/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/mime.types?rev=774501&r1=774500&r2=774501&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.2.x/docs/conf/mime.types Wed May 13 19:50:58 2009
@@ -12,6 +12,7 @@
 application/activemessage
 application/andrew-inset			ez
 application/applefile
+application/applixware				aw
 application/atom+xml				atom
 application/atomcat+xml				atomcat
 application/atomicmail
@@ -21,6 +22,7 @@
 application/beep+xml
 application/cals-1840
 application/ccxml+xml				ccxml
+application/cea-2018+xml
 application/cellml+xml
 application/cnrp+xml
 application/commonground
@@ -28,6 +30,7 @@
 application/cpl+xml
 application/csta+xml
 application/cstadata+xml
+application/cu-seeme				cu
 application/cybercash
 application/davmount+xml			davmount
 application/dca-rft
@@ -40,8 +43,11 @@
 application/edi-consent
 application/edi-x12
 application/edifact
+application/emma+xml				emma
 application/epp+xml
+application/epub+zip				epub
 application/eshop
+application/example
 application/fastinfoset
 application/fastsoap
 application/fits
@@ -49,6 +55,9 @@
 application/h224
 application/http
 application/hyperstudio				stk
+application/ibe-key-request+xml
+application/ibe-pkg-reply+xml
+application/ibe-pp-data
 application/iges
 application/im-iscomposing+xml
 application/index
@@ -59,6 +68,9 @@
 application/iotp
 application/ipp
 application/isup
+application/java-archive			jar
+application/java-serialized-object		ser
+application/java-vm				class
 application/javascript				js
 application/json				json
 application/kpml-request+xml
@@ -95,14 +107,17 @@
 application/msword				doc dot
 application/mxf					mxf
 application/nasdata
+application/news-checkgroups
+application/news-groupinfo
 application/news-transmission
 application/nss
 application/ocsp-request
 application/ocsp-response
-application/octet-stream bin dms lha lzh class so iso dmg dist distz pkg bpk dump elc
+application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc
 application/oda					oda
-application/oebps-package+xml
+application/oebps-package+xml			opf
 application/ogg					ogx
+application/onenote				onetoc onetoc2 onetmp onepkg
 application/parityfec
 application/patch-ops-error+xml			xer
 application/pdf					pdf
@@ -189,11 +204,16 @@
 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.xdp+xml			xdp
 application/vnd.adobe.xfdf			xfdf
 application/vnd.aether.imp
+application/vnd.airzip.filesecure.azf		azf
+application/vnd.airzip.filesecure.azs		azs
+application/vnd.amazon.ebook			azw
 application/vnd.americandynamics.acc		acc
 application/vnd.amiga.ami			ami
+application/vnd.android.package-archive		apk
 application/vnd.anser-web-certificate-issue-initiation	cii
 application/vnd.anser-web-funds-transfer-initiation	fti
 application/vnd.antix.game-component		atx
@@ -203,6 +223,7 @@
 application/vnd.autopackage
 application/vnd.avistar+xml
 application/vnd.blueice.multipass		mpm
+application/vnd.bluetooth.ep.oob
 application/vnd.bmi				bmi
 application/vnd.businessobjects			rep
 application/vnd.cab-jscript
@@ -232,19 +253,33 @@
 application/vnd.cups-ppd			ppd
 application/vnd.cups-raster
 application/vnd.cups-raw
-application/vnd.curl				curl
+application/vnd.curl.car			car
+application/vnd.curl.pcurl			pcurl
 application/vnd.cybank
 application/vnd.data-vision.rdz			rdz
 application/vnd.denovo.fcselayout-link		fe_launch
+application/vnd.dir-bi.plate-dl-nosuffix
 application/vnd.dna				dna
 application/vnd.dolby.mlp			mlp
+application/vnd.dolby.mobile.1
+application/vnd.dolby.mobile.2
 application/vnd.dpgraph				dpg
 application/vnd.dreamfactory			dfac
 application/vnd.dvb.esgcontainer
+application/vnd.dvb.ipdcdftnotifaccess
 application/vnd.dvb.ipdcesgaccess
+application/vnd.dvb.ipdcroaming
 application/vnd.dvb.iptv.alfec-base
 application/vnd.dvb.iptv.alfec-enhancement
+application/vnd.dvb.notif-aggregate-root+xml
+application/vnd.dvb.notif-container+xml
+application/vnd.dvb.notif-generic+xml
+application/vnd.dvb.notif-ia-msglist+xml
+application/vnd.dvb.notif-ia-registration-request+xml
+application/vnd.dvb.notif-ia-registration-response+xml
+application/vnd.dvb.notif-init+xml
 application/vnd.dxr
+application/vnd.dynageo				geo
 application/vnd.ecdis-update
 application/vnd.ecowin.chart			mag
 application/vnd.ecowin.filerequest
@@ -252,6 +287,7 @@
 application/vnd.ecowin.series
 application/vnd.ecowin.seriesrequest
 application/vnd.ecowin.seriesupdate
+application/vnd.emclient.accessrequest+xml
 application/vnd.enliven				nml
 application/vnd.epson.esf			esf
 application/vnd.epson.msf			msf
@@ -260,16 +296,31 @@
 application/vnd.epson.ssf			ssf
 application/vnd.ericsson.quickcall
 application/vnd.eszigno3+xml			es3 et3
+application/vnd.etsi.aoc+xml
+application/vnd.etsi.cug+xml
+application/vnd.etsi.iptvcommand+xml
+application/vnd.etsi.iptvdiscovery+xml
+application/vnd.etsi.iptvprofile+xml
+application/vnd.etsi.iptvsad-bc+xml
+application/vnd.etsi.iptvsad-cod+xml
+application/vnd.etsi.iptvsad-npvr+xml
+application/vnd.etsi.iptvueprofile+xml
+application/vnd.etsi.mcid+xml
+application/vnd.etsi.sci+xml
+application/vnd.etsi.simservs+xml
 application/vnd.eudora.data
 application/vnd.ezpix-album			ez2
 application/vnd.ezpix-package			ez3
+application/vnd.f-secure.mobile
 application/vnd.fdf				fdf
+application/vnd.fdsn.mseed			mseed
+application/vnd.fdsn.seed			seed dataless
 application/vnd.ffsns
 application/vnd.fints
 application/vnd.flographit			gph
 application/vnd.fluxtime.clip			ftc
 application/vnd.font-fontforge-sfd
-application/vnd.framemaker			fm frame maker
+application/vnd.framemaker			fm frame maker book
 application/vnd.frogans.fnc			fnc
 application/vnd.frogans.ltf			ltf
 application/vnd.fsc.weblaunch			fsc
@@ -287,6 +338,9 @@
 application/vnd.fut-misnet
 application/vnd.fuzzysheet			fzs
 application/vnd.genomatix.tuxedo		txd
+application/vnd.geogebra.file			ggb
+application/vnd.geogebra.tool			ggt
+application/vnd.geometry-explorer		gex gre
 application/vnd.gmx				gmx
 application/vnd.google-earth.kml+xml		kml
 application/vnd.google-earth.kmz		kmz
@@ -323,6 +377,7 @@
 application/vnd.immervision-ivp			ivp
 application/vnd.immervision-ivu			ivu
 application/vnd.informedcontrol.rms+xml
+application/vnd.informix-visionary
 application/vnd.intercon.formnet		xpw xpx
 application/vnd.intertrust.digibox
 application/vnd.intertrust.nncp
@@ -409,18 +464,31 @@
 application/vnd.ms-asf				asf
 application/vnd.ms-cab-compressed		cab
 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
+application/vnd.ms-excel.sheet.macroenabled.12		xlsm
+application/vnd.ms-excel.template.macroenabled.12	xltm
 application/vnd.ms-fontobject			eot
 application/vnd.ms-htmlhelp			chm
 application/vnd.ms-ims				ims
 application/vnd.ms-lrm				lrm
+application/vnd.ms-pki.seccat			cat
+application/vnd.ms-pki.stl			stl
 application/vnd.ms-playready.initiator+xml
 application/vnd.ms-powerpoint			ppt pps pot
+application/vnd.ms-powerpoint.addin.macroenabled.12		ppam
+application/vnd.ms-powerpoint.presentation.macroenabled.12	pptm
+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-project			mpp mpt
 application/vnd.ms-tnef
 application/vnd.ms-wmdrm.lic-chlg-req
 application/vnd.ms-wmdrm.lic-resp
 application/vnd.ms-wmdrm.meter-chlg-req
 application/vnd.ms-wmdrm.meter-resp
+application/vnd.ms-word.document.macroenabled.12	docm
+application/vnd.ms-word.template.macroenabled.12	dotm
 application/vnd.ms-works			wps wks wcm wdb
 application/vnd.ms-wpl				wpl
 application/vnd.ms-xpsdocument			xps
@@ -460,8 +528,9 @@
 application/vnd.novadigm.ext			ext
 application/vnd.oasis.opendocument.chart		odc
 application/vnd.oasis.opendocument.chart-template	otc
+application/vnd.oasis.opendocument.database		odb
 application/vnd.oasis.opendocument.formula		odf
-application/vnd.oasis.opendocument.formula-template	otf
+application/vnd.oasis.opendocument.formula-template	odft
 application/vnd.oasis.opendocument.graphics		odg
 application/vnd.oasis.opendocument.graphics-template	otg
 application/vnd.oasis.opendocument.image		odi
@@ -508,10 +577,19 @@
 application/vnd.omads-folder+xml
 application/vnd.omaloc-supl-init
 application/vnd.openofficeorg.extension		oxt
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide	sldx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow	ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template	potx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet	xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template	xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document	docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template	dotx
 application/vnd.osa.netdeploy
+application/vnd.osgi.bundle
 application/vnd.osgi.dp				dp
 application/vnd.otps.ct-kip+xml
-application/vnd.palm				prc pdb pqa oprc
+application/vnd.palm				pdb pqa oprc
 application/vnd.paos.xml
 application/vnd.pg.format			str
 application/vnd.pg.osasli			ei6
@@ -536,12 +614,14 @@
 application/vnd.quark.quarkxpress		qxd qxt qwd qwt qxl qxb
 application/vnd.rapid
 application/vnd.recordare.musicxml		mxl
-application/vnd.recordare.musicxml+xml
+application/vnd.recordare.musicxml+xml		musicxml
 application/vnd.renlearn.rlprint
+application/vnd.rim.cod				cod
 application/vnd.rn-realmedia			rm
 application/vnd.route66.link66+xml		link66
 application/vnd.ruckus.download
 application/vnd.s3sms
+application/vnd.sbm.cid
 application/vnd.sbm.mid2
 application/vnd.scribus
 application/vnd.sealed.3df
@@ -565,6 +645,7 @@
 application/vnd.shana.informed.package		ipk
 application/vnd.simtech-mindmapper		twd twds
 application/vnd.smaf				mmf
+application/vnd.smart.teacher			teacher
 application/vnd.software602.filler.form+xml
 application/vnd.software602.filler.form-xml-zip
 application/vnd.solent.sdkm+xml			sdkm sdkd
@@ -573,14 +654,33 @@
 application/vnd.sss-cod
 application/vnd.sss-dtf
 application/vnd.sss-ntf
+application/vnd.stardivision.calc		sdc
+application/vnd.stardivision.draw		sda
+application/vnd.stardivision.impress		sdd
+application/vnd.stardivision.math		smf
+application/vnd.stardivision.writer		sdw
+application/vnd.stardivision.writer		vor
+application/vnd.stardivision.writer-global	sgl
 application/vnd.street-stream
+application/vnd.sun.xml.calc			sxc
+application/vnd.sun.xml.calc.template		stc
+application/vnd.sun.xml.draw			sxd
+application/vnd.sun.xml.draw.template		std
+application/vnd.sun.xml.impress			sxi
+application/vnd.sun.xml.impress.template	sti
+application/vnd.sun.xml.math			sxm
+application/vnd.sun.xml.writer			sxw
+application/vnd.sun.xml.writer.global		sxg
+application/vnd.sun.xml.writer.template		stw
 application/vnd.sun.wadl+xml
 application/vnd.sus-calendar			sus susp
 application/vnd.svd				svd
 application/vnd.swiftview-ics
+application/vnd.symbian.install			sis sisx
 application/vnd.syncml+xml			xsm
 application/vnd.syncml.dm+wbxml			bdm
 application/vnd.syncml.dm+xml			xdm
+application/vnd.syncml.dm.notification
 application/vnd.syncml.ds.notification
 application/vnd.tao.intent-module-archive	tao
 application/vnd.tmobile-livetv			tmo
@@ -632,6 +732,7 @@
 application/vnd.wv.ssp+xml
 application/vnd.xara				xar
 application/vnd.xfdl				xfdl
+application/vnd.xfdl.webform
 application/vnd.xmi+xml
 application/vnd.xmpie.cpkg
 application/vnd.xmpie.dpkg
@@ -641,9 +742,12 @@
 application/vnd.yamaha.hv-dic			hvd
 application/vnd.yamaha.hv-script		hvs
 application/vnd.yamaha.hv-voice			hvp
+application/vnd.yamaha.openscoreformat			osf
+application/vnd.yamaha.openscoreformat.osfpvg+xml	osfpvg
 application/vnd.yamaha.smaf-audio		saf
 application/vnd.yamaha.smaf-phrase		spf
 application/vnd.yellowriver-custom-menu		cmp
+application/vnd.zul				zir zirz
 application/vnd.zzazz.deck+xml			zaz
 application/voicexml+xml			vxml
 application/watcherinfo+xml
@@ -654,7 +758,11 @@
 application/wordperfect5.1
 application/wsdl+xml				wsdl
 application/wspolicy+xml			wspolicy
+application/x-abiword				abw
 application/x-ace-compressed			ace
+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-bzip				bz
@@ -665,13 +773,35 @@
 application/x-compress
 application/x-cpio				cpio
 application/x-csh				csh
-application/x-director				dcr dir dxr fgd
+application/x-debian-package			deb udeb
+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-font-bdf				bdf
+application/x-font-dos
+application/x-font-framemaker
+application/x-font-ghostscript			gsf
+application/x-font-libgrx
+application/x-font-linux-psf			psf
+application/x-font-otf				otf
+application/x-font-pcf				pcf
+application/x-font-snf				snf
+application/x-font-speedo
+application/x-font-sunos-news
+application/x-font-ttf				ttf ttc
+application/x-font-type1			pfa pfb pfm afm
+application/x-font-vfont
 application/x-futuresplash			spl
+application/x-gnumeric				gnumeric
 application/x-gtar				gtar
 application/x-gzip
 application/x-hdf				hdf
+application/x-java-jnlp-file			jnlp
 application/x-latex				latex
+application/x-mobipocket-ebook			prc mobi
 application/x-ms-wmd				wmd
 application/x-ms-wmz				wmz
 application/x-msaccess				mdb
@@ -701,18 +831,24 @@
 application/x-tar				tar
 application/x-tcl				tcl
 application/x-tex				tex
+application/x-tex-tfm				tfm
 application/x-texinfo				texinfo texi
 application/x-ustar				ustar
 application/x-wais-source			src
 application/x-x509-ca-cert			der crt
+application/x-xfig				fig
+application/x-xpinstall				xpi
 application/x400-bp
 application/xcap-att+xml
 application/xcap-caps+xml
 application/xcap-el+xml
 application/xcap-error+xml
 application/xcap-ns+xml
+application/xcon-conference-info-diff+xml
+application/xcon-conference-info+xml
 application/xenc+xml				xenc
 application/xhtml+xml				xhtml xht
+application/xhtml-voice+xml
 application/xml					xml xsl
 application/xml-dtd				dtd
 application/xml-external-parsed-entity
@@ -726,6 +862,7 @@
 audio/3gpp
 audio/3gpp2
 audio/ac3
+audio/adpcm					adp
 audio/amr
 audio/amr-wb
 audio/amr-wb+
@@ -753,6 +890,8 @@
 audio/evrcwb
 audio/evrcwb0
 audio/evrcwb1
+audio/example
+audio/g719
 audio/g722
 audio/g7221
 audio/g723
@@ -784,6 +923,8 @@
 audio/ogg					oga ogg spx
 audio/parityfec
 audio/pcma
+audio/pcma-wb
+audio/pcmu-wb
 audio/pcmu
 audio/prs.sid
 audio/qcelp
@@ -812,7 +953,13 @@
 audio/vnd.cns.inf1
 audio/vnd.digital-winds				eol
 audio/vnd.dlna.adts
+audio/vnd.dolby.heaac.1
+audio/vnd.dolby.heaac.2
 audio/vnd.dolby.mlp
+audio/vnd.dolby.mps
+audio/vnd.dolby.pl2
+audio/vnd.dolby.pl2x
+audio/vnd.dolby.pl2z
 audio/vnd.dts					dts
 audio/vnd.dts.hd				dtshd
 audio/vnd.everad.plj
@@ -832,6 +979,7 @@
 audio/vorbis
 audio/vorbis-config
 audio/wav					wav
+audio/x-aac					aac
 audio/x-aiff					aif aiff aifc
 audio/x-mpegurl					m3u
 audio/x-ms-wax					wax
@@ -848,6 +996,7 @@
 chemical/x-xyz					xyz
 image/bmp					bmp
 image/cgm					cgm
+image/example
 image/fits
 image/g3fax					g3
 image/gif					gif
@@ -879,6 +1028,7 @@
 image/vnd.mix
 image/vnd.ms-modi				mdi
 image/vnd.net-fpx				npx
+image/vnd.radiance
 image/vnd.sealed.png
 image/vnd.sealedmedia.softseal.gif
 image/vnd.sealedmedia.softseal.jpg
@@ -887,6 +1037,7 @@
 image/vnd.xiff					xif
 image/x-cmu-raster				ras
 image/x-cmx					cmx
+image/x-freehand				fh fhc fh4 fh5 fh7
 image/x-icon					ico
 image/x-pcx					pcx
 image/x-pict					pic pct
@@ -901,12 +1052,14 @@
 message/cpim
 message/delivery-status
 message/disposition-notification
+message/example
 message/external-body
 message/global
 message/global-delivery-status
 message/global-disposition-notification
 message/global-headers
 message/http
+message/imdn+xml
 message/news
 message/partial
 message/rfc822					eml mime
@@ -915,11 +1068,13 @@
 message/sipfrag
 message/tracking-status
 message/vnd.si.simp
+model/example
 model/iges					igs iges
 model/mesh					msh mesh silo
 model/vnd.dwf					dwf
 model/vnd.flatland.3dml
 model/vnd.gdl					gdl
+model/vnd.gs-gdl
 model/vnd.gs.gdl
 model/vnd.gtw					gtw
 model/vnd.moml+xml
@@ -933,6 +1088,7 @@
 multipart/byteranges
 multipart/digest
 multipart/encrypted
+multipart/example
 multipart/form-data
 multipart/header-set
 multipart/mixed
@@ -946,8 +1102,11 @@
 text/csv					csv
 text/directory
 text/dns
+text/ecmascript
 text/enriched
+text/example
 text/html					html htm
+text/javascript
 text/parityfec
 text/plain					txt text conf def list log in
 text/prs.fallenstein.rst
@@ -965,7 +1124,10 @@
 text/ulpfec
 text/uri-list					uri uris urls
 text/vnd.abc
-text/vnd.curl
+text/vnd.curl					curl
+text/vnd.curl.dcurl				dcurl
+text/vnd.curl.scurl				scurl
+text/vnd.curl.mcurl				mcurl
 text/vnd.dmclientscript
 text/vnd.esmertec.theme-descriptor
 text/vnd.fly					fly
@@ -1004,6 +1166,7 @@
 video/bt656
 video/celb
 video/dv
+video/example
 video/h261					h261
 video/h263					h263
 video/h263-1998
@@ -1054,7 +1217,10 @@
 video/vnd.sealed.swf
 video/vnd.sealedmedia.softseal.mov
 video/vnd.vivo					viv
+video/x-f4v					f4v
 video/x-fli					fli
+video/x-flv					flv
+video/x-m4v					m4v
 video/x-ms-asf					asf asx
 video/x-ms-wm					wm
 video/x-ms-wmv					wmv

Propchange: httpd/httpd/branches/2.2.x/docs/conf/mime.types
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 19:50:58 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/docs/conf/mime.types:83749-721972,726109,728015,728020,728220,729316-729317,729586,732414,732421,732451,732504,732832,733127,733134,733218-733219,733465,733467,733695,734703,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535
+/httpd/httpd/trunk/docs/conf/mime.types:83749-774500



Mime
View raw message