Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 90875 invoked from network); 3 Dec 2009 23:27:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Dec 2009 23:27:42 -0000 Received: (qmail 82474 invoked by uid 500); 3 Dec 2009 23:27:42 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 82421 invoked by uid 500); 3 Dec 2009 23:27:42 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 82412 invoked by uid 99); 3 Dec 2009 23:27:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2009 23:27:42 +0000 X-ASF-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL,BAYES_00 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; Thu, 03 Dec 2009 23:27:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C813723889BB; Thu, 3 Dec 2009 23:27:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886984 - /sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types Date: Thu, 03 Dec 2009 23:27:19 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091203232719.C813723889BB@eris.apache.org> Author: fmeschbe Date: Thu Dec 3 23:27:19 2009 New Revision: 886984 URL: http://svn.apache.org/viewvc?rev=886984&view=rev Log: SLING-973 Update core MIME types to the httpd 2.2.14 state (thanks Justin Edelson for the patch) Modified: sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types Modified: sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types?rev=886984&r1=886983&r2=886984&view=diff ============================================================================== --- sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types (original) +++ sling/trunk/bundles/commons/mime/src/main/resources/META-INF/core_mime.types Thu Dec 3 23:27:19 2009 @@ -20,8 +20,7 @@ # # This file is copied from # -# http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types -# Rev. 774215 +# http://svn.apache.org/repos/asf/httpd/httpd/tags/2.2.14/docs/conf/mime.types # # # NOTE: Please do not edit this file other than syncing its content @@ -30,20 +29,25 @@ # mime.types file. # # -# See SLING-964 for more information +# See SLING-964, SLING-973 for more information # # This is a comment. I love comments. -# This file controls what Internet media types are sent to the client for -# given file extension(s). Sending the correct media type to the client -# is important so they know how to handle the content of the file. -# Extra types can either be added here or by using an AddType directive -# in your config files. For more information about Internet media types, -# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type -# registry is at . - +# This file maps Internet media types to unique file extension(s). +# Although created for httpd, this file is used by many software systems +# and has been placed in the public domain for unlimited redisribution. +# +# The table below contains both registered and (common) unregistered types. +# A type that has no unique extension can be ignored -- they are listed +# here to guide configurations toward known types and to make it easier to +# identify "new" types. File extensions are also commonly used to indicate +# content languages and encodings, so choose them carefully. +# +# Internet media types should be registered as described in RFC 4288. +# The registry is at . +# # MIME type Extensions application/activemessage application/andrew-inset ez @@ -149,7 +153,7 @@ 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 +application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy application/oda oda application/oebps-package+xml opf application/ogg ogx @@ -273,7 +277,7 @@ application/vnd.claymore cla application/vnd.clonk.c4group c4g c4d c4f c4p c4u application/vnd.commerce-battelle -application/vnd.commonspace csp cst +application/vnd.commonspace csp application/vnd.contact.cmsg cdbcmsg application/vnd.cosmocaller cmc application/vnd.crick.clicker clkx @@ -497,7 +501,7 @@ application/vnd.motorola.iprm application/vnd.mozilla.xul+xml xul application/vnd.ms-artgalry cil -application/vnd.ms-asf asf +application/vnd.ms-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 @@ -838,8 +842,10 @@ application/x-java-jnlp-file jnlp application/x-latex latex application/x-mobipocket-ebook prc mobi +application/x-ms-application application application/x-ms-wmd wmd application/x-ms-wmz wmz +application/x-ms-xbap xbap application/x-msaccess mdb application/x-msbinder obd application/x-mscardfile crd @@ -860,6 +866,7 @@ application/x-sh sh application/x-shar shar application/x-shockwave-flash swf +application/x-silverlight-app xap application/x-stuffit sit application/x-stuffitx sitx application/x-sv4cpio sv4cpio @@ -1014,7 +1021,6 @@ audio/vnd.vmx.cvsd audio/vorbis audio/vorbis-config -audio/wav wav audio/x-aac aac audio/x-aiff aif aiff aifc audio/x-mpegurl m3u @@ -1028,7 +1034,7 @@ chemical/x-cmdf cmdf chemical/x-cml cml chemical/x-csml csml -chemical/x-pdb pdb +chemical/x-pdb chemical/x-xyz xyz image/bmp bmp image/cgm cgm @@ -1264,4 +1270,4 @@ video/x-ms-wvx wvx video/x-msvideo avi video/x-sgi-movie movie -x-conference/x-cooltalk ice +x-conference/x-cooltalk ice \ No newline at end of file