Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F00D9F1C for ; Sun, 15 Jan 2012 22:35:37 +0000 (UTC) Received: (qmail 25072 invoked by uid 500); 15 Jan 2012 22:35:36 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 24863 invoked by uid 500); 15 Jan 2012 22:35:36 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 24856 invoked by uid 99); 15 Jan 2012 22:35:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jan 2012 22:35:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jan 2012 22:35:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 272F823888CD; Sun, 15 Jan 2012 22:35:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1231780 - in /httpd/httpd/branches/2.4.x: ./ docs/conf/mime.types Date: Sun, 15 Jan 2012 22:35:14 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120115223514.272F823888CD@eris.apache.org> Author: sf Date: Sun Jan 15 22:35:13 2012 New Revision: 1231780 URL: http://svn.apache.org/viewvc?rev=1231780&view=rev Log: Merge r1229930: More registered media types Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/docs/conf/mime.types Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 22:35:13 2012 @@ -1,3 +1,3 @@ /httpd/httpd/branches/revert-ap-ldap:1150158-1150173 /httpd/httpd/branches/wombat-integration:723609-723841 -/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1231442,1231446 +/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1231442,1231446 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=1231780&r1=1231779&r2=1231780&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/conf/mime.types (original) +++ httpd/httpd/branches/2.4.x/docs/conf/mime.types Sun Jan 15 22:35:13 2012 @@ -26,7 +26,9 @@ application/atomsvc+xml atomsvc # application/auth-policy+xml # application/batch-smtp # application/beep+xml +# application/calendar+xml # application/cals-1840 +# application/ccmp+xml application/ccxml+xml ccxml application/cdmi-capability cdmia application/cdmi-container cdmic @@ -83,6 +85,7 @@ application/hyperstudio stk # application/index.obj # application/index.response # application/index.vnd +application/inkml+xml ink inkml # application/iotp application/ipfix ipfix # application/ipp @@ -147,6 +150,7 @@ application/oda oda application/oebps-package+xml opf application/ogg ogx application/onenote onetoc onetoc2 onetmp onepkg +application/oxps oxps # application/parityfec application/patch-ops-error+xml xer application/pdf pdf @@ -185,6 +189,10 @@ application/resource-lists-diff+xml rld # application/riscos # application/rlmi+xml application/rls-services+xml rs +application/rpki-ghostbusters gbr +application/rpki-manifest mft +application/rpki-roa roa +# application/rpki-updown application/rsd+xml rsd application/rss+xml rss application/rtf rtf @@ -238,6 +246,7 @@ application/thraud+xml tfi application/timestamped-data tsd # application/tve-trigger # application/ulpfec +# application/vcard+xml # application/vemmi # application/vividence.scriptfile # application/vnd.3gpp.bsf+xml @@ -275,6 +284,7 @@ application/vnd.apple.installer+xml mpk application/vnd.apple.mpegurl m3u8 # application/vnd.arastra.swi application/vnd.aristanetworks.swi swi +application/vnd.astraea-software.iota iota application/vnd.audiograph aep # application/vnd.autopackage # application/vnd.avistar+xml @@ -295,6 +305,7 @@ application/vnd.cloanto.rp9 rp9 application/vnd.clonk.c4group c4g c4d c4f c4p c4u application/vnd.cluetrust.cartomobile-config c11amc application/vnd.cluetrust.cartomobile-config-pkg c11amz +# application/vnd.collection+json # application/vnd.commerce-battelle application/vnd.commonspace csp application/vnd.contact.cmsg cdbcmsg @@ -312,6 +323,7 @@ application/vnd.ctc-posml pml application/vnd.cups-ppd ppd # application/vnd.cups-raster # application/vnd.cups-raw +# application/vnd.curl application/vnd.curl.car car application/vnd.curl.pcurl pcurl # application/vnd.cybank @@ -319,6 +331,7 @@ application/vnd.data-vision.rdz rdz application/vnd.dece.data uvf uvvf uvd uvvd application/vnd.dece.ttml+xml uvt uvvt application/vnd.dece.unspecified uvx uvvx +application/vnd.dece.zip uvz uvvz application/vnd.denovo.fcselayout-link fe_launch # application/vnd.dir-bi.plate-dl-nosuffix application/vnd.dna dna @@ -358,6 +371,7 @@ application/vnd.ecowin.chart mag # application/vnd.ecowin.seriesupdate # application/vnd.emclient.accessrequest+xml application/vnd.enliven nml +# application/vnd.eprints.data+xml application/vnd.epson.esf esf application/vnd.epson.msf msf application/vnd.epson.quickanime qam @@ -433,6 +447,7 @@ application/vnd.groove-injector grv application/vnd.groove-tool-message gtm application/vnd.groove-tool-template tpl application/vnd.groove-vcard vcg +# application/vnd.hal+json application/vnd.hal+xml hal application/vnd.handheld-entertainment+xml zmm application/vnd.hbci hbci @@ -588,6 +603,7 @@ application/vnd.mseq mseq # application/vnd.music-niff application/vnd.musician mus application/vnd.muvee.style msty +application/vnd.mynfc taglet # application/vnd.ncd.control # application/vnd.ncd.reference # application/vnd.nervana @@ -636,6 +652,7 @@ application/vnd.oasis.opendocument.text- application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth # application/vnd.obn +# application/vnd.oftn.l10n+json # application/vnd.oipf.contentaccessdownload+xml # application/vnd.oipf.contentaccessstreaming+xml # application/vnd.oipf.cspg-hexbinary @@ -665,12 +682,15 @@ application/vnd.olpc-sugar xo # application/vnd.oma.bcast.sprov+xml # application/vnd.oma.bcast.stkm # application/vnd.oma.cab-address-book+xml +# application/vnd.oma.cab-feature-handler+xml # application/vnd.oma.cab-pcc+xml +# application/vnd.oma.cab-user-prefs+xml # application/vnd.oma.dcd # application/vnd.oma.dcdc application/vnd.oma.dd2+xml dd2 # application/vnd.oma.drm.risd+xml # application/vnd.oma.group-usage-list+xml +# application/vnd.oma.pal+xml # application/vnd.oma.poc.detailed-progress-report+xml # application/vnd.oma.poc.final-report+xml # application/vnd.oma.poc.groups+xml @@ -857,6 +877,7 @@ application/vnd.stardivision.impress sd application/vnd.stardivision.math smf application/vnd.stardivision.writer sdw vor application/vnd.stardivision.writer-global sgl +application/vnd.stepmania.package smzip application/vnd.stepmania.stepchart sm # application/vnd.street-stream application/vnd.sun.xml.calc sxc @@ -880,6 +901,7 @@ 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.tcpdump.pcap pcap cap dmp application/vnd.tmobile-livetv tmo application/vnd.trid.tpt tpt application/vnd.triscape.mxs mxs @@ -949,6 +971,7 @@ application/vnd.yamaha.openscoreformat.o # application/vnd.yamaha.remote-setup application/vnd.yamaha.smaf-audio saf application/vnd.yamaha.smaf-phrase spf +# application/vnd.yamaha.through-ngn # application/vnd.yamaha.tunnel-udpencap application/vnd.yellowriver-custom-menu cmp application/vnd.zul zir zirz @@ -1096,6 +1119,7 @@ audio/basic au snd # audio/dsr-es202050 # audio/dsr-es202211 # audio/dsr-es202212 +# audio/dv # audio/dvi4 # audio/eac3 # audio/evrc @@ -1109,6 +1133,7 @@ audio/basic au snd # audio/evrcwb0 # audio/evrcwb1 # audio/example +# audio/fwdred # audio/g719 # audio/g722 # audio/g7221 @@ -1126,6 +1151,7 @@ audio/basic au snd # audio/gsm-efr # audio/gsm-hr-08 # audio/ilbc +# audio/ip-mr_v2.5 # audio/l16 # audio/l20 # audio/l24 @@ -1186,6 +1212,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.everad.plj # audio/vnd.hns.audio audio/vnd.lucent.voice lvp @@ -1337,6 +1364,7 @@ text/csv csv # text/ecmascript # text/enriched # text/example +# text/fwdred text/html html htm # text/javascript text/n3 n3 @@ -1358,12 +1386,14 @@ text/troff t tr roff man me ms text/turtle ttl # text/ulpfec text/uri-list uri uris urls +text/vcard vcard # text/vnd.abc text/vnd.curl curl text/vnd.curl.dcurl dcurl text/vnd.curl.scurl scurl text/vnd.curl.mcurl mcurl # text/vnd.dmclientscript +text/vnd.dvb.subtitle sub # text/vnd.esmertec.theme-descriptor text/vnd.fly fly text/vnd.fmi.flexstor flx @@ -1443,6 +1473,7 @@ video/vnd.dece.video uvv uvvv # video/vnd.directv.mpeg # video/vnd.directv.mpeg-tts # video/vnd.dlna.mpeg-tts +video/vnd.dvb.file dvb video/vnd.fvt fvt # video/vnd.hns.video # video/vnd.iptvforum.1dparityfec-1010